summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-09-04 14:17:28 +0200
committerGitHub <noreply@github.com>2017-09-04 14:17:28 +0200
commit30ca3b70edea01dea092e495db1acf85183bfb80 (patch)
tree0261443100bc8867f600d2668d1c93d21268ffce /tests
parentc04a494ea7c960c0a6b85c0826f02f35a07c8886 (diff)
parent0326c2c54fe26dc742ebe00c66bd0363e083712d (diff)
downloadnextcloud-server-30ca3b70edea01dea092e495db1acf85183bfb80.tar.gz
nextcloud-server-30ca3b70edea01dea092e495db1acf85183bfb80.zip
Merge pull request #6196 from nextcloud/downstream-26539-2
Handle invalid ext storage backend to keep mount point visible
Diffstat (limited to 'tests')
-rw-r--r--tests/Core/Controller/LoginControllerTest.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/Core/Controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php
index 169beff2b9d..e02b8403a2a 100644
--- a/tests/Core/Controller/LoginControllerTest.php
+++ b/tests/Core/Controller/LoginControllerTest.php
@@ -26,6 +26,7 @@ use OC\Core\Controller\LoginController;
use OC\User\Session;
use OCP\AppFramework\Http\RedirectResponse;
use OCP\AppFramework\Http\TemplateResponse;
+use OCP\Defaults;
use OCP\IConfig;
use OCP\ILogger;
use OCP\IRequest;
@@ -54,6 +55,8 @@ class LoginControllerTest extends TestCase {
private $logger;
/** @var Manager|\PHPUnit_Framework_MockObject_MockObject */
private $twoFactorManager;
+ /** @var Defaults|\PHPUnit_Framework_MockObject_MockObject */
+ private $defaults;
public function setUp() {
parent::setUp();
@@ -65,6 +68,7 @@ class LoginControllerTest extends TestCase {
$this->urlGenerator = $this->createMock(IURLGenerator::class);
$this->logger = $this->createMock(ILogger::class);
$this->twoFactorManager = $this->createMock(Manager::class);
+ $this->defaults = $this->createMock(Defaults::class);
$this->loginController = new LoginController(
'core',
@@ -75,7 +79,8 @@ class LoginControllerTest extends TestCase {
$this->userSession,
$this->urlGenerator,
$this->logger,
- $this->twoFactorManager
+ $this->twoFactorManager,
+ $this->defaults
);
}