MAGETWO-97212: Enable skipped test - Move Anchored Category with Products (cron is ON, "Update on Save")

Author: dimonovp

dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml

@@ -179,5 +179,31 @@
                 <item name="dataset" xsi:type="string">catalogProductSimple::default</item>
             </field>
         </dataset>
+        <dataset name="default_subcategory_with_anchored_parent_with_product">
+            <field name="name" xsi:type="string">DefaultSubcategory%isolation%</field>
+            <field name="url_key" xsi:type="string">default-subcategory-%isolation%</field>
+            <field name="parent_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default_anchored_category_with_product</item>
+            </field>
+            <field name="is_active" xsi:type="string">Yes</field>
+            <field name="include_in_menu" xsi:type="string">Yes</field>
+            <field name="is_anchor" xsi:type="string">Yes</field>
+            <field name="category_products" xsi:type="array">
+                <item name="dataset" xsi:type="string">catalogProductSimple::default</item>
+            </field>
+        </dataset>
+        <dataset name="default_anchored_category_with_product">
+            <field name="name" xsi:type="string">Category%isolation%</field>
+            <field name="url_key" xsi:type="string">category%isolation%</field>
+            <field name="is_active" xsi:type="string">Yes</field>
+            <field name="include_in_menu" xsi:type="string">Yes</field>
+            <field name="is_anchor" xsi:type="string">Yes</field>
+            <field name="parent_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default_category</item>
+            </field>
+            <field name="category_products" xsi:type="array">
+                <item name="dataset" xsi:type="string">catalogProductSimple::product_5_dollar</item>
+            </field>
+        </dataset>
     </repository>
 </config>

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/MoveCategoryEntityTest.xml

@@ -15,8 +15,7 @@
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCategoryInGrid" />
         </variation>
         <variation name="MoveCategoryEntityTestVariation2" summary="Move default subcategory with anchored parent to default subcategory" ticketId="MAGETWO-21202">
-            <data name="issue" xsi:type="string">MAGETWO-65147: Category is not present in Layered navigation block when anchor is on</data>
-            <data name="childCategory/dataset" xsi:type="string">default_subcategory_with_anchored_parent</data>
+            <data name="childCategory/dataset" xsi:type="string">default_subcategory_with_anchored_parent_with_product</data>
             <data name="parentCategory/dataset" xsi:type="string">default</data>
             <data name="moveLevel" xsi:type="number">2</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryMovedMessage" />
@@ -25,9 +24,8 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryBreadcrumbs" />
         </variation>
         <variation name="MoveCategoryEntityTestVariation3" summary="Move default anchored subcategory with anchored parent to default subcategory" ticketId="MAGETWO-21202">
-            <data name="issue" xsi:type="string">MAGETWO-65147: Category is not present in Layered navigation block when anchor is on</data>
             <data name="childCategory/dataset" xsi:type="string">default_subcategory_with_anchored_parent</data>
-            <data name="childCategory/data/parent_id/dataset" xsi:type="string">default_anchor_subcategory_with_anchored_parent</data>
+            <data name="childCategory/data/parent_id/dataset" xsi:type="string">default_subcategory_with_anchored_parent_with_product</data>
             <data name="parentCategory/dataset" xsi:type="string">default_category</data>
             <data name="moveLevel" xsi:type="number">2</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryMovedMessage" />

dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Block/Navigation.php

@@ -64,6 +64,13 @@ class Navigation extends Block
      */
     private $productQty = '/following-sibling::span[contains(text(), "%s")]';
 
+    /**
+     * Selector for child element with product quantity.
+     *
+     * @var string
+     */
+    private $productQtyInCategory = '/span[contains(text(), "%s")]';
+
     /**
      * Remove all applied filters.
      *
@@ -124,10 +131,19 @@ public function applyFilter($filter, $linkPattern)
      */
     public function isCategoryVisible(Category $category, $qty)
     {
-        return $this->_rootElement->find(
-            sprintf($this->categoryName, $category->getName()) . sprintf($this->productQty, $qty),
-            Locator::SELECTOR_XPATH
-        )->isVisible();
+        $link = $this->_rootElement->find(sprintf($this->optionTitle, 'Category'), Locator::SELECTOR_XPATH);
+        if ($link->isVisible()) {
+            $link->click();
+            return $this->_rootElement->find(
+                sprintf($this->categoryName, $category->getName()) . sprintf($this->productQtyInCategory, $qty),
+                Locator::SELECTOR_XPATH
+            )->isVisible();
+        } else {
+            return $this->_rootElement->find(
+                sprintf($this->categoryName, $category->getName()) . sprintf($this->productQty, $qty),
+                Locator::SELECTOR_XPATH
+            )->isVisible();
+        }
     }
 
     /**