From 847a2426b8614b8fd5f7d05175dc4885a8a45e9c Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Tue, 9 Feb 2016 11:22:05 +0100 Subject: Fix unit tests for system tag filter section --- apps/files/tests/controller/ViewControllerTest.php | 25 ++++++++++++++++------ apps/systemtags/appinfo/app.php | 2 +- 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( -- cgit v1.2.3