aboutsummaryrefslogtreecommitdiffstats
path: root/apps/dav/tests
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2017-06-16 10:47:08 +0200
committerGitHub <noreply@github.com>2017-06-16 10:47:08 +0200
commit698a7cb7f0d15d2eee1854d1e7412e618dcc059e (patch)
tree4c4cdd99ca8fbffe30caa534ba6684aae465c588 /apps/dav/tests
parent74654288e64cfb80e950d223c8575b32d04682a0 (diff)
parentb6d6f3c521ac119b56c045a2379bbe4c4f416d6c (diff)
downloadnextcloud-server-698a7cb7f0d15d2eee1854d1e7412e618dcc059e.tar.gz
nextcloud-server-698a7cb7f0d15d2eee1854d1e7412e618dcc059e.zip
Merge pull request #5124 from nextcloud/allow-dirlisting-with-unreadable-items
Allow dir-listing also when one child is blocked by access control
Diffstat (limited to 'apps/dav/tests')
-rw-r--r--apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
index 739c8f62540..885f3c23c24 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
@@ -341,11 +341,12 @@ class FilesPluginTest extends TestCase {
$this->assertEquals('my_fingerprint', $propFind->get(self::DATA_FINGERPRINT_PROPERTYNAME));
}
- /**
- * @expectedException \Sabre\DAV\Exception\NotFound
- */
public function testGetPropertiesWhenNoPermission() {
- /** @var \OCA\DAV\Connector\Sabre\Directory | \PHPUnit_Framework_MockObject_MockObject $node */
+ // No read permissions can be caused by files access control.
+ // But we still want to load the directory list, so this is okay for us.
+ // $this->expectException(\Sabre\DAV\Exception\NotFound::class);
+
+ /** @var \OCA\DAV\Connector\Sabre\Directory|\PHPUnit_Framework_MockObject_MockObject $node */
$node = $this->getMockBuilder('\OCA\DAV\Connector\Sabre\Directory')
->disableOriginalConstructor()
->getMock();