Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCornelius Kölbel <cornelius.koelbel@netknights.it>2016-11-15 10:51:07 +0300
committerRoeland Jago Douma <roeland@famdouma.nl>2017-01-11 13:01:54 +0300
commitb8d41752ca550763e23b29eca5e0ec4ec7d7ecb6 (patch)
tree3b36856eaaf2ed3dcfe88cf0b506573e8338b28a /tests/Core
parentee8c617a6d043f5a850d6d00bc6ca6902da1665d (diff)
Fix tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Diffstat (limited to 'tests/Core')
-rw-r--r--tests/Core/Controller/TwoFactorChallengeControllerTest.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/Core/Controller/TwoFactorChallengeControllerTest.php b/tests/Core/Controller/TwoFactorChallengeControllerTest.php
index 9421a2537e8..3486ae55e2e 100644
--- a/tests/Core/Controller/TwoFactorChallengeControllerTest.php
+++ b/tests/Core/Controller/TwoFactorChallengeControllerTest.php
@@ -126,9 +126,11 @@ class TwoFactorChallengeControllerTest extends TestCase {
->method('exists')
->with('two_factor_auth_error')
->will($this->returnValue(true));
- $this->session->expects($this->once())
+ $this->session->expects($this->exactly(2))
->method('remove')
- ->with('two_factor_auth_error');
+ ->with($this->logicalOr(
+ $this->equalTo('two_factor_auth_error'),
+ $this->equalTo('two_factor_auth_error_message')));
$provider->expects($this->once())
->method('getTemplate')
->with($user)
@@ -144,6 +146,7 @@ class TwoFactorChallengeControllerTest extends TestCase {
'logout_attribute' => 'logoutAttribute',
'template' => '<html/>',
'redirect_url' => '/re/dir/ect/url',
+ 'error_message' => null,
], 'guest');
$this->assertEquals($expected, $this->controller->showChallenge('myprovider', '/re/dir/ect/url'));