Merge branch '1.13' into 2.0

ezecosystem · Jan 30, 2018 · 1105ae2 · 1105ae2
2 parents 1903649 + 7efb1d6
commit 1105ae2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ matrix:
     fast_finish: true
     include:
         # Run behat first as it takes the most time (don't need to specify php version here as we don't really care about version on host)
-        - php: 5.6
+        - php: 7.1
           env: BEFORE="./bin/travis/prepare_behat.sh" TEST_CMD="./bin/travis/runbehat.sh" AFTER_SUCCESS='echo "After success"' RUN_INSTALL=1 COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/redis.yml:doc/docker/selenium.yml" SYMFONY_ENV=behat SYMFONY_DEBUG=0
         - env: BEFORE="./bin/travis/setupnode.sh" TEST_CMD="./bin/travis/runnode.sh" AFTER_SUCCESS="./bin/travis/generate_apidoc.sh"
         - php: 7.0

diff --git a/Tests/js/views/services/assets/ez-navigationhubviewservice-tests.js b/Tests/js/views/services/assets/ez-navigationhubviewservice-tests.js
@@ -334,8 +334,8 @@ YUI.add('ez-navigationhubviewservice-tests', function (Y) {
 
             Assert.isArray(value, "The platformNavigationItems should contain an array");
             Assert.areEqual(
-                2, value.length,
-                "2 items should be configured by default for the platform zone"
+                3, value.length,
+                "3 items should be configured by default for the platform zone"
             );
 
             this._assertLocationNavigationItem(
@@ -344,6 +344,9 @@ YUI.add('ez-navigationhubviewservice-tests', function (Y) {
             this._assertLocationNavigationItem(
                 value[1], "navigationhub.media.library domain=navigationhub", "media-library", "/allez/om/media", "fre-FR-media"
             );
+            this._assertNavigationItem(
+                value[2], "navigationhub.linkmanager.list domain=navigationhub", "link-manager", "adminGenericRoute"
+            );
         },
 
         "'admin' zone": function () {
@@ -520,19 +523,6 @@ YUI.add('ez-navigationhubviewservice-tests', function (Y) {
             delete this.service;
         },
 
-        _testLocationAttribute: function (zone) {
-            var identifier = this[zone + "Identifier"];
-
-            this.service.removeNavigationItem(identifier, zone);
-
-            Y.Array.each(this.service.get(zone + "NavigationItems"), function (item) {
-                Assert.areNotEqual(
-                    identifier, item.get('identifier'),
-                    identifier + " should have been removed"
-                );
-            });
-        },
-
         _testAttribute: function (zone) {
             var identifier = this[zone + "Identifier"];
 
@@ -605,7 +595,7 @@ YUI.add('ez-navigationhubviewservice-tests', function (Y) {
 
             this.service._set('rootMediaLocation', this.rootMediaLocation);
 
-            this._testLocationAttribute('platform');
+            this._testAttribute('platform');
         },
 
         "Should remove the navigation item to the 'admin' zone": function () {