mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix more controller tests in Core subdir 

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
This commit is contained in:
Vincent Petry 2021-03-24 09:02:19 +01:00 committed by backportbot[bot]
parent 365c99b0be
commit 3e815f555d
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/Core/Controller/AutoCompleteControllerTest.php
View File

@ -75,8 +75,8 @@ class AutoCompleteControllerTest extends TestCase {
], ],
// expected // expected
[ [
[ 'id' => 'alice', 'label' => 'Alice A.', 'source' => 'users'], [ 'id' => 'alice', 'label' => 'Alice A.', 'icon' => '', 'source' => 'users', 'status' => '', 'subline' => ''],
[ 'id' => 'bob', 'label' => 'Bob Y.', 'source' => 'users'], [ 'id' => 'bob', 'label' => 'Bob Y.', 'icon' => '', 'source' => 'users', 'status' => '', 'subline' => ''],
], ],
'', '',
'files', 'files',
@ -96,8 +96,8 @@ class AutoCompleteControllerTest extends TestCase {
], ],
// expected // expected
[ [
[ 'id' => 'alice', 'label' => 'Alice A.', 'source' => 'users'], [ 'id' => 'alice', 'label' => 'Alice A.', 'icon' => '', 'source' => 'users', 'status' => '', 'subline' => ''],
[ 'id' => 'bob', 'label' => 'Bob Y.', 'source' => 'users'], [ 'id' => 'bob', 'label' => 'Bob Y.', 'icon' => '', 'source' => 'users', 'status' => '', 'subline' => ''],
], ],
'', '',
null, null,
@ -117,8 +117,8 @@ class AutoCompleteControllerTest extends TestCase {
], ],
// expected // expected
[ [
[ 'id' => 'alice', 'label' => 'Alice A.', 'source' => 'users'], [ 'id' => 'alice', 'label' => 'Alice A.', 'icon' => '', 'source' => 'users', 'status' => '', 'subline' => ''],
[ 'id' => 'bob', 'label' => 'Bob Y.', 'source' => 'users'], [ 'id' => 'bob', 'label' => 'Bob Y.', 'icon' => '', 'source' => 'users', 'status' => '', 'subline' => ''],
], ],
'', '',
'files', 'files',
@ -138,8 +138,8 @@ class AutoCompleteControllerTest extends TestCase {
], ],
], ],
[ [
[ 'id' => 'bob', 'label' => 'Bob Y.', 'source' => 'users'], [ 'id' => 'bob', 'label' => 'Bob Y.', 'icon' => '', 'source' => 'users', 'status' => '', 'subline' => ''],
[ 'id' => 'bobby', 'label' => 'Robert R.', 'source' => 'users'], [ 'id' => 'bobby', 'label' => 'Robert R.', 'icon' => '', 'source' => 'users', 'status' => '', 'subline' => ''],
], ],
'bob', 'bob',
'files', 'files',

2
tests/Core/Controller/LoginControllerTest.php
View File

@ -440,6 +440,7 @@ class LoginControllerTest extends TestCase {
->with('core.login.showLoginForm', [ ->with('core.login.showLoginForm', [
'user' => $user, 'user' => $user,
'redirect_url' => '/apps/files', 'redirect_url' => '/apps/files',
'direct' => 1,
]) ])
->willReturn($loginPageUrl); ->willReturn($loginPageUrl);
$expected = new \OCP\AppFramework\Http\RedirectResponse($loginPageUrl); $expected = new \OCP\AppFramework\Http\RedirectResponse($loginPageUrl);
@ -597,6 +598,7 @@ class LoginControllerTest extends TestCase {
->with('core.login.showLoginForm', [ ->with('core.login.showLoginForm', [
'user' => 'john@doe.com', 'user' => 'john@doe.com',
'redirect_url' => '/apps/files', 'redirect_url' => '/apps/files',
'direct' => 1,
]) ])
->willReturn($loginPageUrl); ->willReturn($loginPageUrl);
$expected = new \OCP\AppFramework\Http\RedirectResponse($loginPageUrl); $expected = new \OCP\AppFramework\Http\RedirectResponse($loginPageUrl);