wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix new tests

Browse source
This commit is contained in:
Joas Schilling 2015-04-27 11:10:31 +02:00
parent a4c314622a
commit 8f61fbb81f
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/lib/encryption/updatetest.php
View file

@ -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';

5
tests/lib/files/storage/wrapper/encryption.php
View file

@ -51,11 +51,8 @@ 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);