aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/encryption/tests/RecoveryTest.php14
1 files changed, 9 insertions, 5 deletions
diff --git a/apps/encryption/tests/RecoveryTest.php b/apps/encryption/tests/RecoveryTest.php
index 37b6671d5cb..af053515f8c 100644
--- a/apps/encryption/tests/RecoveryTest.php
+++ b/apps/encryption/tests/RecoveryTest.php
@@ -211,7 +211,8 @@ class RecoveryTest extends TestCase {
->willReturn([]);
$this->cryptMock->expects($this->once())
- ->method('decryptPrivateKey');
+ ->method('decryptPrivateKey')
+ ->willReturn('privateKey');
$this->instance->recoverUsersFiles('password', 'admin');
$this->addToAssertionCount(1);
}
@@ -226,8 +227,8 @@ class RecoveryTest extends TestCase {
->willReturn(true);
$this->cryptMock->expects($this->once())
- ->method('multiKeyDecrypt')
- ->willReturn(true);
+ ->method('multiKeyDecryptLegacy')
+ ->willReturn('multiKeyDecryptLegacyResult');
$this->fileMock->expects($this->once())
->method('getAccessList')
@@ -244,10 +245,13 @@ class RecoveryTest extends TestCase {
$this->cryptMock->expects($this->once())
- ->method('multiKeyEncrypt');
+ ->method('multiKeyEncrypt')
+ ->willReturn(['admin' => 'shareKey']);
$this->keyManagerMock->expects($this->once())
- ->method('setAllFileKeys');
+ ->method('deleteLegacyFileKey');
+ $this->keyManagerMock->expects($this->once())
+ ->method('setShareKey');
$this->assertNull(self::invokePrivate($this->instance,
'recoverFile',