summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-02-09 11:22:05 +0100
committerVincent Petry <pvince81@owncloud.com>2016-02-09 11:22:05 +0100
commit847a2426b8614b8fd5f7d05175dc4885a8a45e9c (patch)
tree3a0a59e59db53b567562eb4f8f2396eb926a43e0
parente378a757fffa3e43a798c0bce7d2d831912bcf75 (diff)
downloadnextcloud-server-847a2426b8614b8fd5f7d05175dc4885a8a45e9c.tar.gz
nextcloud-server-847a2426b8614b8fd5f7d05175dc4885a8a45e9c.zip
Fix unit tests for system tag filter section
-rw-r--r--apps/files/tests/controller/ViewControllerTest.php25
-rw-r--r--apps/systemtags/appinfo/app.php2
2 files changed, 20 insertions, 7 deletions
diff --git a/apps/files/tests/controller/ViewControllerTest.php b/apps/files/tests/controller/ViewControllerTest.php
index b5df3cfc904..28e2f0c2c9a 100644
--- a/apps/files/tests/controller/ViewControllerTest.php
+++ b/apps/files/tests/controller/ViewControllerTest.php
@@ -168,6 +168,15 @@ class ViewControllerTest extends TestCase {
'icon' => '',
],
2 => [
+ 'id' => 'systemtagsfilter',
+ 'appname' => 'systemtags',
+ 'script' => 'list.php',
+ 'order' => 9,
+ 'name' => new \OC_L10N_String(new \OC_L10N('systemtags'), 'Tags', []),
+ 'active' => false,
+ 'icon' => '',
+ ],
+ 3 => [
'id' => 'sharingin',
'appname' => 'files_sharing',
'script' => 'list.php',
@@ -176,7 +185,7 @@ class ViewControllerTest extends TestCase {
'active' => false,
'icon' => '',
],
- 3 => [
+ 4 => [
'id' => 'sharingout',
'appname' => 'files_sharing',
'script' => 'list.php',
@@ -185,7 +194,7 @@ class ViewControllerTest extends TestCase {
'active' => false,
'icon' => '',
],
- 4 => [
+ 5 => [
'id' => 'sharinglinks',
'appname' => 'files_sharing',
'script' => 'list.php',
@@ -194,7 +203,7 @@ class ViewControllerTest extends TestCase {
'active' => false,
'icon' => '',
],
- 5 => [
+ 6 => [
'id' => 'trashbin',
'appname' => 'files_trashbin',
'script' => 'list.php',
@@ -227,18 +236,22 @@ class ViewControllerTest extends TestCase {
'content' => null,
],
2 => [
- 'id' => 'sharingin',
+ 'id' => 'systemtagsfilter',
'content' => null,
],
3 => [
- 'id' => 'sharingout',
+ 'id' => 'sharingin',
'content' => null,
],
4 => [
- 'id' => 'sharinglinks',
+ 'id' => 'sharingout',
'content' => null,
],
5 => [
+ 'id' => 'sharinglinks',
+ 'content' => null,
+ ],
+ 6 => [
'id' => 'trashbin',
'content' => null,
],
diff --git a/apps/systemtags/appinfo/app.php b/apps/systemtags/appinfo/app.php
index 6bcbae4d0da..00663d5082b 100644
--- a/apps/systemtags/appinfo/app.php
+++ b/apps/systemtags/appinfo/app.php
@@ -76,7 +76,7 @@ $mapperListener = function(MapperEvent $event) use ($activityManager) {
$eventDispatcher->addListener(MapperEvent::EVENT_ASSIGN, $mapperListener);
$eventDispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener);
-$l = \OC::$server->getL10N('files_sharing');
+$l = \OC::$server->getL10N('systemtags');
\OCA\Files\App::getNavigationManager()->add(
array(