Merge pull request #2347 from magento-tsg/2.2-develop-pr24

[TSG] Upporting for 2.2 (pr24) (2.2.5)

Author: Alexander Akimov

dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductAttributeOptionInLayeredNavigation.php

@@ -6,13 +6,11 @@
 
 namespace Magento\ConfigurableProduct\Test\Constraint;
 
-use Magento\Mtf\Fixture\FixtureFactory;
-use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Mtf\Constraint\AbstractConstraint;
-use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
-use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Check whether OOS product attribute options for configurable product are displayed on frontend in Layered navigation.
@@ -43,25 +41,33 @@ public function processAssert(
                 'data' => [
                     'category_ids' => [
                         'dataset' => null,
-                        'category' => $product->getDataFieldConfig('category_ids')['source']->getCategories()[0]
-                    ]
+                        'category' => $product->getDataFieldConfig('category_ids')['source']->getCategories()[0],
+                    ],
                 ],
             ]
         )->persist();
 
         $cmsIndex->open()->getTopmenu()->selectCategoryByName($product->getCategoryIds()[0]);
-        $filters = $catalogCategoryView->getLayeredNavigationBlock()->getFilterContents();
 
-        \PHPUnit_Framework_Assert::assertFalse(
+        $attributesData = $product->hasData('configurable_attributes_data')
+            ? $product->getConfigurableAttributesData()['attributes_data']
+            : [];
+
+        $attributeData = !empty($attributesData) ? array_shift($attributesData) : [];
+        $frontendAttributeLabel = !empty($attributeData) && isset($attributeData['frontend_label'])
+            ? $attributeData['frontend_label']
+            : '';
+
+        $filters = $catalogCategoryView->getLayeredNavigationBlock()->getFilterContents($frontendAttributeLabel);
+
+        \PHPUnit\Framework\Assert::assertFalse(
             in_array(strtoupper($outOfStockOption), $filters),
             'Out of Stock attribute option is present in layered navigation on category page.'
         );
     }
 
     /**
-     * Return string representation of object.
-     *
-     * @return string
+     * @inheritdoc
      */
     public function toString()
     {

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

@@ -104,13 +104,22 @@ public function getFilters()
     /**
      * Get all available filters.
      *
+     * @param string $attributeLabel
      * @return array
      */
-    public function getFilterContents()
+    public function getFilterContents($attributeLabel)
     {
-        $this->waitForElementVisible($this->loadedNarrowByList);
-        $optionContents = $this->_rootElement->find($this->optionContent, Locator::SELECTOR_XPATH);
-        $data =[];
+        $data = [];
+
+        if (trim($attributeLabel) === '') {
+            return $data;
+        }
+
+        $link = sprintf($this->filterLink, $attributeLabel);
+        $this->openFilterContainer($attributeLabel, $link);
+
+        $optionContents = $this->_rootElement->getElements($link, Locator::SELECTOR_XPATH);
+
         foreach ($optionContents as $optionContent) {
             $data[] = trim(strtoupper($optionContent->getText()));
         }
@@ -128,13 +137,8 @@ public function getFilterContents()
      */
     public function applyFilter($filter, $linkPattern)
     {
-        $expandFilterButton = sprintf($this->optionTitle, $filter);
         $links = sprintf($this->filterLink, $filter);
-
-        $this->waitForElementVisible($this->loadedNarrowByList);
-        if (!$this->_rootElement->find($links, Locator::SELECTOR_XPATH)->isVisible()) {
-            $this->_rootElement->find($expandFilterButton, Locator::SELECTOR_XPATH)->click();
-        }
+        $this->openFilterContainer($filter, $links);
 
         $links = $this->_rootElement->getElements($links, Locator::SELECTOR_XPATH);
         foreach ($links as $link) {
@@ -160,4 +164,19 @@ public function isCategoryVisible(Category $category, $qty)
             Locator::SELECTOR_XPATH
         )->isVisible();
     }
+
+    /**
+     * @param string $filter
+     * @param string $link
+     * @return void
+     */
+    private function openFilterContainer($filter, $link)
+    {
+        $expandFilterButton = sprintf($this->optionTitle, $filter);
+
+        $this->waitForElementVisible($this->loadedNarrowByList);
+        if (!$this->_rootElement->find($link, Locator::SELECTOR_XPATH)->isVisible()) {
+            $this->_rootElement->find($expandFilterButton, Locator::SELECTOR_XPATH)->click();
+        }
+    }
 }