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
path: root/tests
diff options
context:
space:
mode:
authorVincent Petry <vincent@nextcloud.com>2021-03-24 11:02:19 +0300
committerVincent Petry <vincent@nextcloud.com>2021-03-24 11:02:19 +0300
commit95e03fba2d933672ec6ead6503d68a48bf264073 (patch)
tree86876de91fba0f4042e6df9190009cca215dabee /tests
parent9b8ca1697af3003d58febd043ad183fe3876e62e (diff)
Fix more controller tests in Core subdir
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/Core/Controller/AutoCompleteControllerTest.php16
-rw-r--r--tests/Core/Controller/LoginControllerTest.php2
2 files changed, 10 insertions, 8 deletions
diff --git a/tests/Core/Controller/AutoCompleteControllerTest.php b/tests/Core/Controller/AutoCompleteControllerTest.php
index 73bc8492113..61fc90e3c82 100644
--- a/tests/Core/Controller/AutoCompleteControllerTest.php
+++ b/tests/Core/Controller/AutoCompleteControllerTest.php
@@ -75,8 +75,8 @@ class AutoCompleteControllerTest extends TestCase {
],
// expected
[
- [ 'id' => 'alice', 'label' => 'Alice A.', 'source' => 'users'],
- [ 'id' => 'bob', 'label' => 'Bob Y.', 'source' => 'users'],
+ [ 'id' => 'alice', 'label' => 'Alice A.', 'icon' => '', 'source' => 'users', 'status' => '', 'subline' => ''],
+ [ 'id' => 'bob', 'label' => 'Bob Y.', 'icon' => '', 'source' => 'users', 'status' => '', 'subline' => ''],
],
'',
'files',
@@ -96,8 +96,8 @@ class AutoCompleteControllerTest extends TestCase {
],
// expected
[
- [ 'id' => 'alice', 'label' => 'Alice A.', 'source' => 'users'],
- [ 'id' => 'bob', 'label' => 'Bob Y.', 'source' => 'users'],
+ [ 'id' => 'alice', 'label' => 'Alice A.', 'icon' => '', 'source' => 'users', 'status' => '', 'subline' => ''],
+ [ 'id' => 'bob', 'label' => 'Bob Y.', 'icon' => '', 'source' => 'users', 'status' => '', 'subline' => ''],
],
'',
null,
@@ -117,8 +117,8 @@ class AutoCompleteControllerTest extends TestCase {
],
// expected
[
- [ 'id' => 'alice', 'label' => 'Alice A.', 'source' => 'users'],
- [ 'id' => 'bob', 'label' => 'Bob Y.', 'source' => 'users'],
+ [ 'id' => 'alice', 'label' => 'Alice A.', 'icon' => '', 'source' => 'users', 'status' => '', 'subline' => ''],
+ [ 'id' => 'bob', 'label' => 'Bob Y.', 'icon' => '', 'source' => 'users', 'status' => '', 'subline' => ''],
],
'',
'files',
@@ -138,8 +138,8 @@ class AutoCompleteControllerTest extends TestCase {
],
],
[
- [ 'id' => 'bob', 'label' => 'Bob Y.', 'source' => 'users'],
- [ 'id' => 'bobby', 'label' => 'Robert R.', 'source' => 'users'],
+ [ 'id' => 'bob', 'label' => 'Bob Y.', 'icon' => '', 'source' => 'users', 'status' => '', 'subline' => ''],
+ [ 'id' => 'bobby', 'label' => 'Robert R.', 'icon' => '', 'source' => 'users', 'status' => '', 'subline' => ''],
],
'bob',
'files',
diff --git a/tests/Core/Controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php
index e9d4a89aa7d..e3469621eec 100644
--- a/tests/Core/Controller/LoginControllerTest.php
+++ b/tests/Core/Controller/LoginControllerTest.php
@@ -440,6 +440,7 @@ class LoginControllerTest extends TestCase {
->with('core.login.showLoginForm', [
'user' => $user,
'redirect_url' => '/apps/files',
+ 'direct' => 1,
])
->willReturn($loginPageUrl);
$expected = new \OCP\AppFramework\Http\RedirectResponse($loginPageUrl);
@@ -597,6 +598,7 @@ class LoginControllerTest extends TestCase {
->with('core.login.showLoginForm', [
'user' => 'john@doe.com',
'redirect_url' => '/apps/files',
+ 'direct' => 1,
])
->willReturn($loginPageUrl);
$expected = new \OCP\AppFramework\Http\RedirectResponse($loginPageUrl);