diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2015-05-22 12:12:31 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2015-05-22 12:12:31 +0200 |
| commit | fef75e5417206fcc36d979022f0f9921a743a3ae (patch) | |
| tree | a94672a8edcf6c019d1c3dfdac7f6858ad3724df /tests/lib/encryption/keys/storage.php | |
| parent | 94077caea90e3646c77fdae69ea63fc84e1f8409 (diff) | |
| download | nextcloud-server-fef75e5417206fcc36d979022f0f9921a743a3ae.tar.gz nextcloud-server-fef75e5417206fcc36d979022f0f9921a743a3ae.zip | |
remove part file extension before we read a filekey to reuse a existing key if possible, otherwise stuff like versioning will break
Diffstat (limited to 'tests/lib/encryption/keys/storage.php')
| -rw-r--r-- | tests/lib/encryption/keys/storage.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/lib/encryption/keys/storage.php b/tests/lib/encryption/keys/storage.php index e67103fb6aa..fa623ac1c1b 100644 --- a/tests/lib/encryption/keys/storage.php +++ b/tests/lib/encryption/keys/storage.php @@ -76,7 +76,9 @@ class StorageTest extends TestCase { $this->util->expects($this->any()) ->method('getUidAndFilename') ->willReturn(array('user1', '/files/foo.txt')); - $this->util->expects($this->any()) + // we need to strip away the part file extension in order to reuse a + // existing key if it exists, otherwise versions will break + $this->util->expects($this->once()) ->method('stripPartialFileExtension') ->willReturnArgument(0); $this->util->expects($this->any()) |