diff options
| author | Roeland Jago Douma <rullzer@owncloud.com> | 2016-04-08 15:14:37 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <rullzer@owncloud.com> | 2016-04-08 15:23:17 +0200 |
| commit | 7f4f0b20ad1ed7dc0386dcc3e97e84ad7ff7c067 (patch) | |
| tree | 51a10992fea0a335002526bb84ac9393702eede6 /apps/encryption/tests | |
| parent | 4c9e257b27cd69fdb68abe3ac6559b56468224d3 (diff) | |
| download | nextcloud-server-7f4f0b20ad1ed7dc0386dcc3e97e84ad7ff7c067.tar.gz nextcloud-server-7f4f0b20ad1ed7dc0386dcc3e97e84ad7ff7c067.zip | |
Fix encryption tests
Diffstat (limited to 'apps/encryption/tests')
| -rw-r--r-- | apps/encryption/tests/lib/MigrationTest.php | 4 | ||||
| -rw-r--r-- | apps/encryption/tests/lib/crypto/encryptionTest.php | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/apps/encryption/tests/lib/MigrationTest.php b/apps/encryption/tests/lib/MigrationTest.php index 6edb8624e70..18f7c8b35d5 100644 --- a/apps/encryption/tests/lib/MigrationTest.php +++ b/apps/encryption/tests/lib/MigrationTest.php @@ -512,13 +512,9 @@ class MigrationTest extends \Test\TestCase { */ public function testGetTargetDir($user, $keyPath, $filename, $trash, $systemMounts, $expected) { - $updater = $this->getMockBuilder('\OC\Files\Cache\Updater') - ->disableOriginalConstructor()->getMock(); $view = $this->getMockBuilder('\OC\Files\View') ->disableOriginalConstructor()->getMock(); $view->expects($this->any())->method('file_exists')->willReturn(true); - $view->expects($this->any())->method('getUpdater')->willReturn($updater); - $m = $this->getMockBuilder('OCA\Encryption\Migration') ->setConstructorArgs( diff --git a/apps/encryption/tests/lib/crypto/encryptionTest.php b/apps/encryption/tests/lib/crypto/encryptionTest.php index 8a228c2c215..ad20efb4451 100644 --- a/apps/encryption/tests/lib/crypto/encryptionTest.php +++ b/apps/encryption/tests/lib/crypto/encryptionTest.php @@ -142,9 +142,6 @@ class EncryptionTest extends TestCase { $this->cryptMock->expects($this->any()) ->method('multiKeyEncrypt') ->willReturn(true); - $this->cryptMock->expects($this->any()) - ->method('setAllFileKeys') - ->willReturn(true); $this->instance->end('/foo/bar'); } |