diff options
| author | Bjoern Schiessle <bjoern@schiessle.org> | 2016-11-23 12:07:04 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <bjoern@schiessle.org> | 2016-11-23 12:20:43 +0100 |
| commit | 8a401ee15687059836c93dda62ee5ea3fbf800cf (patch) | |
| tree | 8326dc5b2df8660f47946926af30d330c234e6f3 /apps/encryption/tests/Crypto/EncryptionTest.php | |
| parent | 558a934842a9f66a873f24b8107fca1fc68fb791 (diff) | |
| download | nextcloud-server-8a401ee15687059836c93dda62ee5ea3fbf800cf.tar.gz nextcloud-server-8a401ee15687059836c93dda62ee5ea3fbf800cf.zip | |
check if session is initialized
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Diffstat (limited to 'apps/encryption/tests/Crypto/EncryptionTest.php')
| -rw-r--r-- | apps/encryption/tests/Crypto/EncryptionTest.php | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/apps/encryption/tests/Crypto/EncryptionTest.php b/apps/encryption/tests/Crypto/EncryptionTest.php index 658f6275bb4..3525d2d4aec 100644 --- a/apps/encryption/tests/Crypto/EncryptionTest.php +++ b/apps/encryption/tests/Crypto/EncryptionTest.php @@ -280,6 +280,21 @@ class EncryptionTest extends TestCase { } /** + * test begin() if encryption is not initialized but the master key is enabled + * in this case we can initialize the encryption without a username/password + * and continue + */ + public function testBeginInitMasterKey() { + + $this->sessionMock->expects($this->once())->method('isReady')->willReturn(false); + $this->utilMock->expects($this->once())->method('isMasterKeyEnabled') + ->willReturn(true); + $this->keyManagerMock->expects($this->once())->method('init')->with('', ''); + + $this->instance->begin('/user/files/welcome.txt', 'user', 'r', [], []); + } + + /** * @dataProvider dataTestUpdate * * @param string $fileKey |