diff options
author | Morris Jobke <hey@morrisjobke.de> | 2017-10-24 16:33:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-24 16:33:03 +0200 |
commit | b1f77aca4effec99387481a831910d4870ae2ffc (patch) | |
tree | 401d6dcd8dc97e0de6cb5cc78d8669bca28c93a8 /tests | |
parent | 306d4e1d40ce076b715a5f0a87e743189da775e6 (diff) | |
parent | 99934134dc53baaee56740de669c7df549317a2f (diff) | |
download | nextcloud-server-b1f77aca4effec99387481a831910d4870ae2ffc.tar.gz nextcloud-server-b1f77aca4effec99387481a831910d4870ae2ffc.zip |
Merge pull request #6919 from nextcloud/di-appmanager-encryption-migration
Use DI for IAppManager to encryption migration
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Settings/Controller/EncryptionControllerTest.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/Settings/Controller/EncryptionControllerTest.php b/tests/Settings/Controller/EncryptionControllerTest.php index bbc2d7b6599..e57f36353a6 100644 --- a/tests/Settings/Controller/EncryptionControllerTest.php +++ b/tests/Settings/Controller/EncryptionControllerTest.php @@ -24,6 +24,7 @@ namespace Tests\Settings\Controller; use OC\DB\Connection; use OC\Files\View; use OC\Settings\Controller\EncryptionController; +use OCP\App\IAppManager; use OCP\IConfig; use OCP\IL10N; use OCP\ILogger; @@ -51,6 +52,8 @@ class EncryptionControllerTest extends TestCase { private $view; /** @var ILogger */ private $logger; + /** @var IAppManager */ + private $appManager; /** @var EncryptionController */ private $encryptionController; @@ -75,6 +78,8 @@ class EncryptionControllerTest extends TestCase { ->disableOriginalConstructor()->getMock(); $this->logger = $this->getMockBuilder('\\OCP\\ILogger') ->disableOriginalConstructor()->getMock(); + $this->appManager = $this->getMockBuilder('\\OCP\\App\\IAppManager') + ->disableOriginalConstructor()->getMock(); $this->encryptionController = $this->getMockBuilder('\\OC\\Settings\\Controller\\EncryptionController') ->setConstructorArgs([ @@ -86,6 +91,7 @@ class EncryptionControllerTest extends TestCase { $this->userManager, $this->view, $this->logger, + $this->appManager, ]) ->setMethods(['getMigration']) ->getMock(); |