diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2013-11-06 09:39:52 +0100 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2013-11-06 09:39:52 +0100 |
| commit | da126f1692cffa30817f99e0d23fa25db6952801 (patch) | |
| tree | 93bbb8cae78702ec5feaf4e77c512c80ca2845aa /apps | |
| parent | 9f4fd0161ec1065b6c731dd9f3f65311283b945a (diff) | |
| download | nextcloud-server-da126f1692cffa30817f99e0d23fa25db6952801.tar.gz nextcloud-server-da126f1692cffa30817f99e0d23fa25db6952801.zip | |
Fixed unit tests for files sharing watcher
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/tests/base.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/tests/watcher.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_sharing/tests/base.php b/apps/files_sharing/tests/base.php index 0c7c5937fac..689c80cb9e6 100644 --- a/apps/files_sharing/tests/base.php +++ b/apps/files_sharing/tests/base.php @@ -29,7 +29,7 @@ use OCA\Files\Share; * * Base class for sharing tests. */ -class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase { +abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase { const TEST_FILES_SHARING_API_USER1 = "test-share-user1"; const TEST_FILES_SHARING_API_USER2 = "test-share-user2"; diff --git a/apps/files_sharing/tests/watcher.php b/apps/files_sharing/tests/watcher.php index 63f38894c70..1a9a54cbcf8 100644 --- a/apps/files_sharing/tests/watcher.php +++ b/apps/files_sharing/tests/watcher.php @@ -55,12 +55,12 @@ class Test_Files_Sharing_Watcher extends Test_Files_Sharing_Base { function tearDown() { $this->sharedCache->clear(); + self::loginHelper(self::TEST_FILES_SHARING_API_USER1); + $fileinfo = $this->view->getFileInfo('container/shareddir'); \OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2); - self::loginHelper(self::TEST_FILES_SHARING_API_USER1); - $this->view->deleteAll('container'); $this->ownerCache->clear(); |