From eb00dbb5931a471bc2c8ef4723ff5eb91ce1c553 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Thu, 21 Sep 2017 18:23:36 +0200
Subject: [PATCH] Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
apps/files/tests/Controller/ViewControllerTest.php | 7 +++++++
tests/lib/NavigationManagerTest.php | 9 +++++++++
2 files changed, 16 insertions(+)
diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php
index 03573232f0d..007335b948d 100644
--- a/apps/files/tests/Controller/ViewControllerTest.php
+++ b/apps/files/tests/Controller/ViewControllerTest.php
@@ -142,6 +142,7 @@ class ViewControllerTest extends TestCase {
'active' => false,
'icon' => '',
'type' => 'link',
+ 'classes' => '',
],
[
'id' => 'recent',
@@ -152,6 +153,7 @@ class ViewControllerTest extends TestCase {
'active' => false,
'icon' => '',
'type' => 'link',
+ 'classes' => '',
],
[
'id' => 'favorites',
@@ -162,6 +164,7 @@ class ViewControllerTest extends TestCase {
'active' => false,
'icon' => '',
'type' => 'link',
+ 'classes' => '',
],
[
'id' => 'sharingin',
@@ -172,6 +175,7 @@ class ViewControllerTest extends TestCase {
'active' => false,
'icon' => '',
'type' => 'link',
+ 'classes' => '',
],
[
'id' => 'sharingout',
@@ -182,6 +186,7 @@ class ViewControllerTest extends TestCase {
'active' => false,
'icon' => '',
'type' => 'link',
+ 'classes' => '',
],
[
'id' => 'sharinglinks',
@@ -192,6 +197,7 @@ class ViewControllerTest extends TestCase {
'active' => false,
'icon' => '',
'type' => 'link',
+ 'classes' => '',
],
[
'id' => 'systemtagsfilter',
@@ -202,6 +208,7 @@ class ViewControllerTest extends TestCase {
'active' => false,
'icon' => '',
'type' => 'link',
+ 'classes' => '',
],
[
'id' => 'trashbin',
diff --git a/tests/lib/NavigationManagerTest.php b/tests/lib/NavigationManagerTest.php
index 1d3024f0530..585161c887b 100644
--- a/tests/lib/NavigationManagerTest.php
+++ b/tests/lib/NavigationManagerTest.php
@@ -72,6 +72,7 @@ class NavigationManagerTest extends TestCase {
'icon' => 'optional',
'href' => 'url',
'type' => 'settings',
+ 'classes' => '',
],
[
'id' => 'entry id',
@@ -81,6 +82,7 @@ class NavigationManagerTest extends TestCase {
'href' => 'url',
'active' => false,
'type' => 'settings',
+ 'classes' => '',
],
],
[
@@ -100,6 +102,7 @@ class NavigationManagerTest extends TestCase {
'href' => 'url',
'active' => false,
'type' => 'link',
+ 'classes' => '',
],
],
];
@@ -255,6 +258,7 @@ class NavigationManagerTest extends TestCase {
'name' => 'Apps',
'active' => false,
'type' => 'settings',
+ 'classes' => '',
]
];
$defaults = [
@@ -266,6 +270,7 @@ class NavigationManagerTest extends TestCase {
'name' => 'Settings',
'active' => false,
'type' => 'settings',
+ 'classes' => '',
],
[
'id' => 'logout',
@@ -275,6 +280,7 @@ class NavigationManagerTest extends TestCase {
'name' => 'Log out',
'active' => false,
'type' => 'settings',
+ 'classes' => '',
],
];
return [
@@ -286,6 +292,7 @@ class NavigationManagerTest extends TestCase {
'name' => 'Test',
'active' => false,
'type' => 'link',
+ 'classes' => '',
]]), ['navigations' => [['route' => 'test.page.index', 'name' => 'Test']]]],
'minimalistic-settings' => [array_merge($defaults, [[
'id' => 'test',
@@ -295,6 +302,7 @@ class NavigationManagerTest extends TestCase {
'name' => 'Test',
'active' => false,
'type' => 'settings',
+ 'classes' => '',
]]), ['navigations' => [['route' => 'test.page.index', 'name' => 'Test', 'type' => 'settings']]]],
'admin' => [array_merge($apps, $defaults, [[
'id' => 'test',
@@ -304,6 +312,7 @@ class NavigationManagerTest extends TestCase {
'name' => 'Test',
'active' => false,
'type' => 'link',
+ 'classes' => '',
]]), ['navigations' => [['@attributes' => ['role' => 'admin'], 'route' => 'test.page.index', 'name' => 'Test']]], true],
'no name' => [array_merge($apps, $defaults), ['navigations' => [['@attributes' => ['role' => 'admin'], 'route' => 'test.page.index']]], true],
'no admin' => [$defaults, ['navigations' => [['@attributes' => ['role' => 'admin'], 'route' => 'test.page.index', 'name' => 'Test']]]]
--
GitLab