aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/tests
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2014-06-18 15:32:16 +0200
committerBjörn Schießle <schiessle@owncloud.com>2014-06-18 15:32:16 +0200
commitedbc6b5db12fe16b6ea7dfb10d116aa9da4e2244 (patch)
treead2e02faba4983acdc1d2cf2b4615c1f6f127dad /apps/files_encryption/tests
parenta921ad89259f1d580292d649a58160fab7a2a2d7 (diff)
parentbcc88be4c77abf1dce0905c5bf67c1c8347b00f7 (diff)
downloadnextcloud-server-edbc6b5db12fe16b6ea7dfb10d116aa9da4e2244.tar.gz
nextcloud-server-edbc6b5db12fe16b6ea7dfb10d116aa9da4e2244.zip
Merge pull request #9068 from owncloud/trashbin_unittests_master
fix trash bin expire operation and add unit tests
Diffstat (limited to 'apps/files_encryption/tests')
-rwxr-xr-xapps/files_encryption/tests/trashbin.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
index 5d54b7db24f..a5479de1b8d 100755
--- a/apps/files_encryption/tests/trashbin.php
+++ b/apps/files_encryption/tests/trashbin.php
@@ -282,7 +282,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
$timestamp = str_replace('d', '', $trashFileSuffix);
// delete file forever
- $this->assertGreaterThan(0, \OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp));
+ $this->assertGreaterThan(0, \OCA\Files_Trashbin\Trashbin::delete($filename, $this->userId, $timestamp));
// check if key for admin not exists
$this->assertFalse($this->view->file_exists(