Merge remote-tracking branch 'owls/MAGETWO-95048-sidebar-nav' into BugFixPR

Author: Joan He

app/code/Magento/Backend/Block/Menu.php

@@ -9,12 +9,12 @@
 /**
  * Backend menu block
  *
- * @api
- * @method \Magento\Backend\Block\Menu setAdditionalCacheKeyInfo(array $cacheKeyInfo)
+ * @method $this setAdditionalCacheKeyInfo(array $cacheKeyInfo)
  * @method array getAdditionalCacheKeyInfo()
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Menu extends \Magento\Backend\Block\Template
 {
@@ -75,21 +75,22 @@ class Menu extends \Magento\Backend\Block\Template
     private $anchorRenderer;
 
     /**
-     * @var ConfigInterface
+     * @var \Magento\Framework\App\Route\ConfigInterface
      */
     private $routeConfig;
 
     /**
-     * @param Template\Context $context
+     * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Backend\Model\UrlInterface $url
      * @param \Magento\Backend\Model\Menu\Filter\IteratorFactory $iteratorFactory
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Backend\Model\Menu\Config $menuConfig
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
-     * @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
      * @param array $data
      * @param MenuItemChecker|null $menuItemChecker
      * @param AnchorRenderer|null $anchorRenderer
+     * @param \Magento\Framework\App\Route\ConfigInterface|null $routeConfig
+     *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -141,6 +142,7 @@ protected function _getAnchorLabel($menuItem)
 
     /**
      * Render menu item mouse events
+     *
      * @param \Magento\Backend\Model\Menu\Item $menuItem
      * @return string
      */
@@ -216,7 +218,7 @@ protected function _callbackSecretKey($match)
     {
         $routeId = $this->routeConfig->getRouteByFrontName($match[1]);
         return \Magento\Backend\Model\UrlInterface::SECRET_KEY_PARAM_NAME . '/' . $this->_url->getSecretKey(
-            $routeId,
+            $routeId ?: $match[1],
             $match[2],
             $match[3]
         );
@@ -354,7 +356,7 @@ protected function _columnBrake($items, $limit)
      * @param \Magento\Backend\Model\Menu\Item $menuItem
      * @param int $level
      * @param int $limit
-     * @param $id int
+     * @param int|null $id
      * @return string HTML code
      */
     protected function _addSubMenu($menuItem, $level, $limit, $id = null)

app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml

@@ -7,9 +7,10 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminMenuSection">
         <element name="catalog" type="button" selector="#menu-magento-catalog-catalog"/>
+        <element name="catalogProducts" type="button" selector="#nav li[data-ui-id='menu-magento-catalog-catalog-products']"/>
         <element name="customers" type="button" selector="#menu-magento-customer-customer"/>
         <element name="content" type="button" selector="#menu-magento-backend-content"/>
         <element name="widgets" type="button" selector="#nav li[data-ui-id='menu-magento-widget-cms-widget-instance']"/>

app/code/Magento/Backend/Test/Mftf/Test/AdminMenuNavigationWithSecretKeysTest.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMenuNavigationWithSecretKeysTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin should be able to navigate between menu options with secret url keys enabled"/>
+            <description value="Admin should be able to navigate between menu options with secret url keys enabled"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-95349"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set admin/security/use_form_key 1" stepKey="enableUrlSecretKeys"/>
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches1"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set admin/security/use_form_key 0" stepKey="disableUrlSecretKeys"/>
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches2"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <click selector="{{AdminMenuSection.stores}}" stepKey="clickStoresMenuOption1"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForStoresMenu1" />
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickStoresConfigurationMenuOption1"/>
+        <waitForPageLoad stepKey="waitForConfigurationPageLoad1"/>
+        <seeCurrentUrlMatches regex="~\/admin\/system_config\/~" stepKey="seeCurrentUrlMatchesConfigPath1"/>
+
+        <click selector="{{AdminMenuSection.catalog}}" stepKey="clickCatalogMenuOption"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCatalogMenu1" />
+        <click selector="{{AdminMenuSection.catalogProducts}}" stepKey="clickCatalogProductsMenuOption"/>
+        <waitForPageLoad stepKey="waitForProductsPageLoad"/>
+        <seeCurrentUrlMatches regex="~\/catalog\/product\/~" stepKey="seeCurrentUrlMatchesProductsPath"/>
+
+        <click selector="{{AdminMenuSection.stores}}" stepKey="clickStoresMenuOption2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForStoresMenu2" />
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickStoresConfigurationMenuOption2"/>
+        <waitForPageLoad stepKey="waitForConfigurationPageLoad2"/>
+        <seeCurrentUrlMatches regex="~\/admin\/system_config\/~" stepKey="seeCurrentUrlMatchesConfigPath2"/>
+    </test>
+</tests>