summaryrefslogtreecommitdiffstats
path: root/tests/lib
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2015-04-09 19:23:27 +0200
committerLukas Reschke <lukas@owncloud.com>2015-04-09 19:23:27 +0200
commit0bad8f644af1ca5b287d391cb7efdb392901b632 (patch)
tree0b116bdd30ec0bb7113f98f41c6a7d6f81118a3c /tests/lib
parentde4a81f4623cf86fd77f56d8f9820742c52bd7e1 (diff)
parent06a5a9d0c21a6fa4df14d08829032453d6136029 (diff)
downloadnextcloud-server-0bad8f644af1ca5b287d391cb7efdb392901b632.tar.gz
nextcloud-server-0bad8f644af1ca5b287d391cb7efdb392901b632.zip
Merge pull request #15511 from owncloud/fix-typos
Fix typos and some other adjustments
Diffstat (limited to 'tests/lib')
-rw-r--r--tests/lib/files/storage/wrapper/encryption.php2
-rw-r--r--tests/lib/files/stream/encryption.php2
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php
index bf4464f0eb9..4f7a9e851c1 100644
--- a/tests/lib/files/storage/wrapper/encryption.php
+++ b/tests/lib/files/storage/wrapper/encryption.php
@@ -44,7 +44,9 @@ class Encryption extends \Test\Files\Storage\Storage {
$file = $this->getMockBuilder('\OC\Encryption\File')
->disableOriginalConstructor()
+ ->setMethods(['getAccessList'])
->getMock();
+ $file->expects($this->any())->method('getAccessList')->willReturn([]);
$logger = $this->getMock('\OC\Log');
diff --git a/tests/lib/files/stream/encryption.php b/tests/lib/files/stream/encryption.php
index 84156337ad7..53727a2213d 100644
--- a/tests/lib/files/stream/encryption.php
+++ b/tests/lib/files/stream/encryption.php
@@ -29,7 +29,9 @@ class Encryption extends \Test\TestCase {
->getMock();
$file = $this->getMockBuilder('\OC\Encryption\File')
->disableOriginalConstructor()
+ ->setMethods(['getAccessList'])
->getMock();
+ $file->expects($this->any())->method('getAccessList')->willReturn([]);
$util = $this->getMock('\OC\Encryption\Util', ['getUidAndFilename'], [new View(), new \OC\User\Manager(), $config]);
$util->expects($this->any())
->method('getUidAndFilename')