diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2016-06-21 11:18:22 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2016-06-21 11:18:22 +0200 |
| commit | 2b493e2f9dca674ba11f88a1d182d6872e04eaaa (patch) | |
| tree | ef7fa75d1b4da812de80e93c3590dbb5404d7f06 /tests/lib/Files/ViewTest.php | |
| parent | b4df57f3f02f65ed71d1072280751170379a53e8 (diff) | |
| parent | 0e575c7eeadc6c8eb11b0be2ed1d39cdcf6cfcb8 (diff) | |
| download | nextcloud-server-2b493e2f9dca674ba11f88a1d182d6872e04eaaa.tar.gz nextcloud-server-2b493e2f9dca674ba11f88a1d182d6872e04eaaa.zip | |
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
Diffstat (limited to 'tests/lib/Files/ViewTest.php')
| -rw-r--r-- | tests/lib/Files/ViewTest.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php index 59b17b83958..87feb63888d 100644 --- a/tests/lib/Files/ViewTest.php +++ b/tests/lib/Files/ViewTest.php @@ -7,6 +7,7 @@ namespace Test\Files; +use OC\Cache\CappedMemoryCache; use OC\Files\Cache\Watcher; use OC\Files\Storage\Common; use OC\Files\Mount\MountPoint; @@ -269,6 +270,9 @@ class ViewTest extends \Test\TestCase { * @dataProvider sharingDisabledPermissionProvider */ public function testRemoveSharePermissionWhenSharingDisabledForUser($excludeGroups, $excludeGroupsList, $expectedShareable) { + // Reset sharing disabled for users cache + $this->invokePrivate(\OC::$server->getShareManager(), 'sharingDisabledForUsersCache', [new CappedMemoryCache()]); + $appConfig = \OC::$server->getAppConfig(); $oldExcludeGroupsFlag = $appConfig->getValue('core', 'shareapi_exclude_groups', 'no'); $oldExcludeGroupsList = $appConfig->getValue('core', 'shareapi_exclude_groups_list', ''); @@ -290,6 +294,9 @@ class ViewTest extends \Test\TestCase { $appConfig->setValue('core', 'shareapi_exclude_groups', $oldExcludeGroupsFlag); $appConfig->setValue('core', 'shareapi_exclude_groups_list', $oldExcludeGroupsList); + + // Reset sharing disabled for users cache + $this->invokePrivate(\OC::$server->getShareManager(), 'sharingDisabledForUsersCache', [new CappedMemoryCache()]); } public function testCacheIncompleteFolder() { |