Merge remote-tracking branch 'origin/MAGETWO-90940' into 2.2-develop-pr33

zakdma · zakdma · commit 903e7a4c8eb1 · 2018-07-05T11:13:38.000+03:00
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category.php
@@ -3,12 +3,27 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Controller\Adminhtml;
 
+use Magento\Store\Model\Store;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\Stdlib\DateTime\Filter\Date;
+use Magento\Catalog\Model\Category as CategoryModel;
+use Magento\Backend\App\Action;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Registry;
+use Magento\Cms\Model\Wysiwyg\Config;
+use Magento\Backend\Model\View\Result\Page;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Backend\Model\Auth\Session;
+use Magento\Framework\DataObject;
+
 /**
  * Catalog category controller
  */
-abstract class Category extends \Magento\Backend\App\Action
+abstract class Category extends Action
 {
     /**
      * Authorization level of a basic admin session
@@ -18,18 +33,16 @@ abstract class Category extends \Magento\Backend\App\Action
     const ADMIN_RESOURCE = 'Magento_Catalog::categories';
 
     /**
-     * @var \Magento\Framework\Stdlib\DateTime\Filter\Date
+     * @var Date
      */
     protected $dateFilter;
 
     /**
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\Stdlib\DateTime\Filter\Date|null $dateFilter
+     * @param Context $context
+     * @param Date|null $dateFilter
      */
-    public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter = null
-    ) {
+    public function __construct(Context $context, Date $dateFilter = null)
+    {
         $this->dateFilter = $dateFilter;
         parent::__construct($context);
     }
@@ -39,20 +52,20 @@ public function __construct(
      * Root category can be returned, if inappropriate store/category is specified
      *
      * @param bool $getRootInstead
-     * @return \Magento\Catalog\Model\Category|false
+     * @return CategoryModel|false
      */
-    protected function _initCategory($getRootInstead = false)
+    protected function _initCategory(bool $getRootInstead = false)
     {
         $categoryId = $this->resolveCategoryId();
-        $storeId = (int)$this->getRequest()->getParam('store');
-        $category = $this->_objectManager->create(\Magento\Catalog\Model\Category::class);
+        $storeId = $this->resolveStoreId();
+        $category = $this->_objectManager->create(CategoryModel::class);
         $category->setStoreId($storeId);
 
         if ($categoryId) {
             $category->load($categoryId);
             if ($storeId) {
                 $rootId = $this->_objectManager->get(
-                    \Magento\Store\Model\StoreManagerInterface::class
+                    StoreManagerInterface::class
                 )->getStore(
                     $storeId
                 )->getRootCategoryId();
@@ -67,9 +80,9 @@ protected function _initCategory($getRootInstead = false)
             }
         }
 
-        $this->_objectManager->get(\Magento\Framework\Registry::class)->register('category', $category);
-        $this->_objectManager->get(\Magento\Framework\Registry::class)->register('current_category', $category);
-        $this->_objectManager->get(\Magento\Cms\Model\Wysiwyg\Config::class)
+        $this->_objectManager->get(Registry::class)->register('category', $category);
+        $this->_objectManager->get(Registry::class)->register('current_category', $category);
+        $this->_objectManager->get(Config::class)
             ->setStoreId($this->getRequest()->getParam('store'));
         return $category;
     }
@@ -79,31 +92,46 @@ protected function _initCategory($getRootInstead = false)
      *
      * @return int
      */
-    private function resolveCategoryId()
+    private function resolveCategoryId(): int
     {
         $categoryId = (int)$this->getRequest()->getParam('id', false);
 
         return $categoryId ?: (int)$this->getRequest()->getParam('entity_id', false);
     }
 
+    /**
+     * Resolve store id
+     *
+     * Tries to take store id from store HTTP parameter
+     * @see Store
+     *
+     * @return int
+     */
+    private function resolveStoreId(): int
+    {
+        $storeId = (int)$this->getRequest()->getParam('store', false);
+
+        return $storeId ?: (int)$this->getRequest()->getParam('store_id', Store::DEFAULT_STORE_ID);
+    }
+
     /**
      * Build response for ajax request
      *
-     * @param \Magento\Catalog\Model\Category $category
-     * @param \Magento\Backend\Model\View\Result\Page $resultPage
+     * @param CategoryModel $category
+     * @param Page $resultPage
      *
-     * @return \Magento\Framework\Controller\Result\Json
+     * @return Json
      *
      * @deprecated 101.0.0
      */
-    protected function ajaxRequestResponse($category, $resultPage)
+    protected function ajaxRequestResponse(CategoryModel $category, Page $resultPage): Json
     {
         // prepare breadcrumbs of selected category, if any
         $breadcrumbsPath = $category->getPath();
         if (empty($breadcrumbsPath)) {
             // but if no category, and it is deleted - prepare breadcrumbs from path, saved in session
             $breadcrumbsPath = $this->_objectManager->get(
-                \Magento\Backend\Model\Auth\Session::class
+                Session::class
             )->getDeletedPath(
                 true
             );
@@ -119,7 +147,7 @@ protected function ajaxRequestResponse($category, $resultPage)
             }
         }
 
-        $eventResponse = new \Magento\Framework\DataObject([
+        $eventResponse = new DataObject([
             'content' => $resultPage->getLayout()->getUiComponent('category_form')->getFormHtml()
                 . $resultPage->getLayout()->getBlock('category.tree')
                     ->getBreadcrumbsJavascript($breadcrumbsPath, 'editingCategoryBreadcrumbs'),
@@ -130,22 +158,23 @@ protected function ajaxRequestResponse($category, $resultPage)
             'category_prepare_ajax_response',
             ['response' => $eventResponse, 'controller' => $this]
         );
-        /** @var \Magento\Framework\Controller\Result\Json $resultJson */
-        $resultJson = $this->_objectManager->get(\Magento\Framework\Controller\Result\Json::class);
+        /** @var Json $resultJson */
+        $resultJson = $this->_objectManager->get(Json::class);
         $resultJson->setHeader('Content-type', 'application/json', true);
         $resultJson->setData($eventResponse->getData());
+
         return $resultJson;
     }
 
     /**
      * Datetime data preprocessing
      *
-     * @param \Magento\Catalog\Model\Category $category
+     * @param CategoryModel $category
      * @param array $postData
      *
      * @return array
      */
-    protected function dateTimePreprocessing($category, $postData)
+    protected function dateTimePreprocessing(CategoryModel $category, array $postData): array
     {
         $dateFieldFilters = [];
         $attributes = $category->getAttributes();
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml
@@ -41,4 +41,21 @@
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
         <dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryEntity.name)}}" stepKey="dontSeeCategoryInTree"/>
     </actionGroup>
+    <!--Actions to switch store view in category edit page-->
+    <actionGroup name="switchCategoryStoreView">
+        <arguments>
+            <argument name="store"/>
+            <argument name="catName"/>
+        </arguments>
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="amOnCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(catName)}}" stepKey="navigateToCreatedCategory"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <scrollToTopOfPage stepKey="scrollToToggle"/>
+        <click selector="{{AdminCategoryMainActionsSection.categoryStoreViewDropdownToggle}}" stepKey="openStoreViewDropDown"/>
+        <click selector="{{AdminCategoryMainActionsSection.categoryStoreViewOption(store)}}" stepKey="selectStoreView"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <click selector="{{AdminCategoryMainActionsSection.categoryStoreViewModalAccept}}" stepKey="selectStoreViewAccept"/>
+        <waitForPageLoad stepKey="waitForStoreViewChangeLoad"/>
+    </actionGroup>
 </actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryBasicFieldSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryBasicFieldSection.xml
@@ -11,9 +11,12 @@
     <section name="AdminCategoryBasicFieldSection">
         <element name="IncludeInMenu" type="checkbox" selector="input[name='include_in_menu']"/>
         <element name="includeInMenuLabel" type="text" selector="input[name='include_in_menu']+label"/>
+        <element name="includeInMenuUseDefault" type="checkbox" selector="input[name='use_default[include_in_menu]']"/>
         <element name="EnableCategory" type="checkbox" selector="input[name='is_active']"/>
         <element name="enableCategoryLabel" type="text" selector="input[name='is_active']+label"/>
+        <element name="enableUseDefault" type="checkbox" selector="input[name='use_default[is_active]']"/>
         <element name="CategoryNameInput" type="input" selector="input[name='name']"/>
+        <element name="categoryNameUseDefault" type="checkbox" selector="input[name='use_default[name]']"/>
     </section>
     <section name="CatalogWYSIWYGSection">
         <element name="ShowHideBtn" type="button" selector="#togglecategory_form_description"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMainActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMainActionsSection.xml
@@ -11,5 +11,8 @@
     <section name="AdminCategoryMainActionsSection">
         <element name="SaveButton" type="button" selector=".page-actions-inner #save" timeout="30"/>
         <element name="DeleteButton" type="button" selector=".page-actions-inner #delete" timeout="30"/>
+        <element name="categoryStoreViewDropdownToggle" type="button" selector="#store-change-button"/>
+        <element name="categoryStoreViewOption" type="button" selector="//div[contains(@class, 'store-switcher')]//a[normalize-space()='{{store}}']" parameterized="true"/>
+        <element name="categoryStoreViewModalAccept" type="button" selector=".modal-popup.confirm._show .action-accept"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySEOSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySEOSection.xml
@@ -11,6 +11,8 @@
     <section name="AdminCategorySEOSection">
         <element name="SectionHeader" type="button" selector="div[data-index='search_engine_optimization']" timeout="30"/>
         <element name="UrlKeyInput" type="input" selector="input[name='url_key']"/>
+        <element name="urlKeyDefaultValueCheckbox" type="button" selector="input[name='use_default[url_key]']"/>
+        <element name="urlKeyRedirectCheckbox" type="button" selector="[data-index='url_key_create_redirect'] input[type='checkbox']"/>
         <element name="MetaTitleInput" type="input" selector="input[name='meta_title']"/>
         <element name="MetaKeywordsInput" type="textarea" selector="textarea[name='meta_keywords']"/>
         <element name="MetaDescriptionInput" type="textarea" selector="textarea[name='meta_description']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminUpdateCategoryStoreUrlKeyTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminUpdateCategoryStoreUrlKeyTest.xml
@@ -0,0 +1,78 @@
+<?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="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminUpdateCategoryStoreUrlKeyTest">
+        <annotations>
+            <features value="SEO-friendly URL Key Update"/>
+            <stories value="Update SEO-friendly URL via the Admin"/>
+            <title value="SEO-friendly URL should update regardless of scope or redirect change."/>
+            <description value="SEO-friendly URL should update regardless of scope or redirect change."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-92916"/>
+            <group value="category"/>
+        </annotations>
+        <before>
+            <!-- Create category -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage"/>
+            <waitForPageLoad stepKey="waitForPageLoad1"/>
+            <actionGroup ref="CreateCategory" stepKey="createCategory">
+                <argument name="categoryEntity" value="_defaultCategory"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!-- Delete category and logout from admin account -->
+            <actionGroup ref="DeleteCategory" stepKey="deleteCategory">
+                <argument name="categoryEntity" value="_defaultCategory"/>
+            </actionGroup>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!--Switch to "Default Store View" scope-->
+        <actionGroup ref="switchCategoryStoreView" stepKey="SwitchStoreView">
+            <argument name="store" value="_defaultStore.name"/>
+            <argument name="catName" value="_defaultCategory.name"/>
+        </actionGroup>
+        <!--See "Use Default Value" checkboxes-->
+        <seeElement selector="{{AdminCategoryBasicFieldSection.enableUseDefault}}" stepKey="seeUseDefaultEnable"/>
+        <seeElement selector="{{AdminCategoryBasicFieldSection.includeInMenuUseDefault}}" stepKey="seeUseDefaultMenu"/>
+        <seeElement selector="{{AdminCategoryBasicFieldSection.categoryNameUseDefault}}" stepKey="seeUseDefaultName"/>
+        <!-- Update SEO key, uncheck "Create Redirect", confirm in frontend -->
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}"  stepKey="openSeoSection"/>
+        <uncheckOption selector="{{AdminCategorySEOSection.urlKeyDefaultValueCheckbox}}" stepKey="uncheckUseDefaultUrlKey"/>
+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{_defaultCategory.name_lwr}}-hattest" stepKey="enterURLKey"/>
+        <uncheckOption selector="{{AdminCategorySEOSection.urlKeyRedirectCheckbox}}"  stepKey="uncheckRedirect1"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryAfterFirstSeoUpdate"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessage"/>
+        <amOnPage url="" stepKey="goToStorefront"/>
+        <waitForPageLoad stepKey="waitForFrontendLoad"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="clickCategory"/>
+        <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{_defaultCategory.name}}" stepKey="assertCategoryOnStorefront"/>
+        <seeInTitle userInput="{{_defaultCategory.name}}" stepKey="seeCategoryNameInTitle"/>
+        <seeInCurrentUrl stepKey="verifyUrlKey" url="{{_defaultCategory.name_lwr}}-hattest.html"/>
+        <!-- Update SEO key to original, uncheck "Create Redirect", confirm in frontend -->
+        <!--Switch to "Default Store View" scope-->
+        <actionGroup ref="switchCategoryStoreView" stepKey="SwitchStoreView2">
+            <argument name="store" value="_defaultStore.name"/>
+            <argument name="catName" value="_defaultCategory.name"/>
+        </actionGroup>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}"  stepKey="openSeoSection2"/>
+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{_defaultCategory.name_lwr}}" stepKey="enterOriginalURLKey"/>
+        <uncheckOption selector="{{AdminCategorySEOSection.urlKeyRedirectCheckbox}}"  stepKey="uncheckRedirect2"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryAfterOriginalSeoKey"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessageAfterOriginalSeoKey"/>
+        <amOnPage url="" stepKey="goToStorefrontAfterOriginalSeoKey"/>
+        <waitForPageLoad stepKey="waitForFrontendLoadAfterOriginalSeoKey"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="clickCategoryAfterOriginalSeoKey"/>
+        <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{_defaultCategory.name}}" stepKey="assertCategoryOnStorefront2"/>
+        <seeInTitle userInput="{{_defaultCategory.name}}" stepKey="seeCategoryNameInTitle2"/>
+        <seeInCurrentUrl url="{{_defaultCategory.name_lwr}}.html" stepKey="verifyUrlKeyAfterOriginalSeoKey"/>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Data/StoreData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Data/StoreData.xml
@@ -6,6 +6,11 @@
   */
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="_defaultStore" type="store">
+        <data key="name">Default Store View</data>
+        <data key="code">default</data>
+        <data key="is_active">1</data>
+    </entity>
     <entity name="customStore" type="store">
         <!--data key="group_id">customStoreGroup.id</data-->
         <data key="name" unique="suffix">store</data>
