summaryrefslogtreecommitdiffstats
path: root/tests/lib/files/storage/wrapper/encryption.php
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2015-05-11 10:35:42 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2015-05-11 12:06:57 +0200
commit0d5c7a11e287f44ad556d29b952c57c9ec11dfaa (patch)
tree40f6ac27a0253b13e392fae44dce5843fa13fe4b /tests/lib/files/storage/wrapper/encryption.php
parentebf3953908a8dfdb754a5031d69326c6b83cf609 (diff)
downloadnextcloud-server-0d5c7a11e287f44ad556d29b952c57c9ec11dfaa.tar.gz
nextcloud-server-0d5c7a11e287f44ad556d29b952c57c9ec11dfaa.zip
use hooks to update encryption keys instead of the storage wrapper if a file gets renamed/restored, as long as we
are in the storage wrapper the file cache isn't up-to-date
Diffstat (limited to 'tests/lib/files/storage/wrapper/encryption.php')
-rw-r--r--tests/lib/files/storage/wrapper/encryption.php11
1 files changed, 1 insertions, 10 deletions
diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php
index d4492e00928..97810c9c5dd 100644
--- a/tests/lib/files/storage/wrapper/encryption.php
+++ b/tests/lib/files/storage/wrapper/encryption.php
@@ -157,13 +157,11 @@ class Encryption extends \Test\Files\Storage\Storage {
* @param string $target
* @param $encryptionEnabled
* @param boolean $renameKeysReturn
- * @param boolean $shouldUpdate
*/
public function testRename($source,
$target,
$encryptionEnabled,
- $renameKeysReturn,
- $shouldUpdate) {
+ $renameKeysReturn) {
if ($encryptionEnabled) {
$this->keyStore
->expects($this->once())
@@ -177,13 +175,6 @@ class Encryption extends \Test\Files\Storage\Storage {
->method('isFile')->willReturn(true);
$this->encryptionManager->expects($this->once())
->method('isEnabled')->willReturn($encryptionEnabled);
- if ($shouldUpdate) {
- $this->update->expects($this->once())
- ->method('update');
- } else {
- $this->update->expects($this->never())
- ->method('update');
- }
$this->instance->mkdir($source);
$this->instance->mkdir(dirname($target));