Merge pull request magento#4538 from magento-epam/EPAM-PR-68

Hypernova-Oy · Jul 30, 2019 · 65cdb4c · 65cdb4c
2 parents 12bcf3f + cb17bbe
commit 65cdb4c
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 229 deletions.
diff --git a/app/code/Magento/Catalog/Plugin/Block/Topmenu.php b/app/code/Magento/Catalog/Plugin/Block/Topmenu.php
@@ -14,11 +14,6 @@
  */
 class Topmenu
 {
-    /**
-     * Cache tag for menu block
-     */
-    private $cacheTag = "top_menu";
-
     /**
      * Catalog category
      *
@@ -124,7 +119,6 @@ public function beforeGetIdentities(\Magento\Theme\Block\Html\Topmenu $subject)
         $subject->addIdentity(Category::CACHE_TAG);
         $rootId = $this->storeManager->getStore()->getRootCategoryId();
         $storeId = $this->storeManager->getStore()->getId();
-        $currentCategory = $this->getCurrentCategory();
         /** @var \Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
         $collection = $this->getCategoryTree($storeId, $rootId);
         $mapping = [$rootId => $subject->getMenu()];  // use nodes stack to avoid recursion
@@ -134,9 +128,6 @@ public function beforeGetIdentities(\Magento\Theme\Block\Html\Topmenu $subject)
             }
             $subject->addIdentity(Category::CACHE_TAG . '_' . $category->getId());
         }
-        if ($currentCategory) {
-            $subject->addIdentity($this->cacheTag . '_' . Category::CACHE_TAG . '_' . $currentCategory->getId());
-        }
     }
 
     /**

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
@@ -13,8 +13,6 @@
         <element name="expandAll" type="button" selector=".tree-actions a:last-child"/>
         <element name="categoryTreeRoot" type="text" selector="div.x-tree-root-node>li.x-tree-node:first-of-type>div.x-tree-node-el:first-of-type" timeout="30"/>
         <element name="categoryInTree" type="text" selector="//a/span[contains(text(), '{{name}}')]" parameterized="true" timeout="30"/>
-        <element name="categoryHighlighted" type="text" selector="//ul[@id='ui-id-2']//li//a/span[contains(text(),'{{name}}')]/../.." parameterized="true" timeout="30"/>
-        <element name="categoryNotHighlighted" type="text" selector="ul[id=\'ui-id-2\'] li[class~=\'active\']" timeout="30"/>
         <element name="categoryInTreeUnderRoot" type="text" selector="//li/ul/li[@class='x-tree-node']/div/a/span[contains(text(), '{{name}}')]" parameterized="true"/>
         <element name="lastCreatedCategory" type="block" selector=".x-tree-root-ct li li:last-child" />
         <element name="treeContainer" type="block" selector=".tree-holder" />

diff --git a/.../Magento/Catalog/Test/Mftf/Test/CheckCurrentCategoryIsHighlightedAndProductsDisplayed.xml b/.../Magento/Catalog/Test/Mftf/Test/CheckCurrentCategoryIsHighlightedAndProductsDisplayed.xml
diff --git a/...to/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml b/...to/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
@@ -55,6 +55,7 @@ public function __construct(
         ForwardFactory $resultForwardFactory
     ) {
         parent::__construct($context);
+        $productHelper->setSkipSaleableCheck(true);
         $this->escaper = $escaper;
         $this->resultPageFactory = $resultPageFactory;
         $this->resultForwardFactory = $resultForwardFactory;

diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml
@@ -9,7 +9,6 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminOrderFormConfigureProductSection">
-        <element name="configure" type="button" selector="//a[@product_id='{{productId}}']" parameterized="true"/>
         <element name="optionSelect" type="select" selector="//div[contains(@class,'product-options')]//select[//label[text() = '{{option}}']]" parameterized="true"/>
         <element name="optionSelectNew" type="select" selector="//label[text()='{{option1}}']/following-sibling::div/select" parameterized="true"/>
         <element name="quantity" type="input" selector="#product_composite_configure_input_qty"/>

diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml
@@ -77,12 +77,6 @@
                 <field key="qty">2</field>
             </createData>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-
-            <!--Go to bundle product page and save it to force "in stock" status-->
-            <actionGroup ref="goToProductPageViaID" stepKey="goToBundleProductPage">
-                <argument name="productId" value="$product.id$"/>
-            </actionGroup>
-            <actionGroup ref="saveProductForm" stepKey="saveBundleProduct"/>
         </before>
 
         <!--Create new customer order-->

diff --git a/app/code/Magento/Theme/Block/Html/Topmenu.php b/app/code/Magento/Theme/Block/Html/Topmenu.php
@@ -74,16 +74,6 @@ protected function getCacheLifetime()
         return parent::getCacheLifetime() ?: 3600;
     }
 
-    /**
-     * Get cache key informative items
-     *
-     * @return array
-     */
-    public function getCacheKeyInfo()
-    {
-        return array_merge(parent::getCacheKeyInfo(), $this->getIdentities());
-    }
-
     /**
      * Get top menu html
      *