diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2015-04-27 11:10:31 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2015-04-27 11:10:31 +0200 |
| commit | 8f61fbb81f371cab0e13970244a47439926a6b57 (patch) | |
| tree | 32086de3ab3c10a99c22578d0d620e6447cff51b /tests | |
| parent | a4c314622a6fbfc7cedeb5096bed5fdb78b6de1c (diff) | |
| download | nextcloud-server-8f61fbb81f371cab0e13970244a47439926a6b57.tar.gz nextcloud-server-8f61fbb81f371cab0e13970244a47439926a6b57.zip | |
Fix new tests
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/encryption/updatetest.php | 2 | ||||
| -rw-r--r-- | tests/lib/files/storage/wrapper/encryption.php | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/tests/lib/encryption/updatetest.php b/tests/lib/encryption/updatetest.php index 08d4125735d..790d071aa68 100644 --- a/tests/lib/encryption/updatetest.php +++ b/tests/lib/encryption/updatetest.php @@ -69,7 +69,7 @@ class UpdateTest extends TestCase { ->disableOriginalConstructor()->getMock(); $this->encryptionManager->expects($this->once()) - ->method('getDefaultEncryptionModule') + ->method('getEncryptionModule') ->willReturn($this->encryptionModule); $this->uid = 'testUser1'; diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php index de43c24659e..93bf8c13e9b 100644 --- a/tests/lib/files/storage/wrapper/encryption.php +++ b/tests/lib/files/storage/wrapper/encryption.php @@ -51,12 +51,9 @@ class Encryption extends \Test\Files\Storage\Storage { $mockModule = $this->buildMockModule(); $this->encryptionManager = $this->getMockBuilder('\OC\Encryption\Manager') ->disableOriginalConstructor() - ->setMethods(['getDefaultEncryptionModule', 'getEncryptionModule', 'isEnabled']) + ->setMethods(['getEncryptionModule', 'isEnabled']) ->getMock(); $this->encryptionManager->expects($this->any()) - ->method('getDefaultEncryptionModule') - ->willReturn($mockModule); - $this->encryptionManager->expects($this->any()) ->method('getEncryptionModule') ->willReturn($mockModule); $this->encryptionManager->expects($this->any()) |