diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-08-03 12:50:01 +0200 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-08-03 12:50:01 +0200 |
commit | af7bcb43b1b74a5f0ad94b645d400510a2ae6bc4 (patch) | |
tree | bd4354c78f67a5fd00d7b1a4f616844c593086c8 /tests | |
parent | 4105d17133a372547396c2f4862f98423f5564e0 (diff) | |
parent | 51a67a54e06eb4119a56a0f9f21b79bdea7c43f3 (diff) | |
download | nextcloud-server-af7bcb43b1b74a5f0ad94b645d400510a2ae6bc4.tar.gz nextcloud-server-af7bcb43b1b74a5f0ad94b645d400510a2ae6bc4.zip |
Merge pull request #18009 from owncloud/enc_always_update_file_cache
let the encryption storage wrapper always update the file cache
Diffstat (limited to 'tests')
-rw-r--r-- | tests/lib/files/storage/wrapper/encryption.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php index 612cf827975..c49e6bb0d1f 100644 --- a/tests/lib/files/storage/wrapper/encryption.php +++ b/tests/lib/files/storage/wrapper/encryption.php @@ -261,10 +261,12 @@ class Encryption extends \Test\Files\Storage\Storage { ->expects($this->once()) ->method('copyKeys') ->willReturn($copyKeysReturn); - $this->cache->expects($this->once()) + $this->cache->expects($this->atLeastOnce()) ->method('put') - ->with($this->anything(), ['encrypted' => true]) - ->willReturn(true); + ->willReturnCallback(function($path, $data) { + $this->assertArrayHasKey('encrypted', $data); + $this->assertTrue($data['encrypted']); + }); } else { $this->cache->expects($this->never())->method('put'); $this->keyStore->expects($this->never())->method('copyKeys'); |