MTO-121: [Variation] Move Anchored Category with Products

- Defects fixed

Author: vitalysery

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php

@@ -65,7 +65,7 @@ class Tree extends Block
      *
      * @var string
      */
-    protected $categoryInTree = '//ul//li//span[contains(text(), "%s")]';
+    private $categoryInTree = '//ul//li//span[contains(text(), "%s")]';
 
     /**
      * Get backend abstract block.

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryNavigationMenu.php

@@ -16,11 +16,16 @@
 class AssertCategoryNavigationMenu extends AbstractConstraint
 {
     /**
-     * Array for category tree.
+     * Default category name.
+     */
+    const DEFAULT_CATEGORY_NAME = 'Default Category';
+
+    /**
+     * List of nested categories names.
      *
      * @var array
      */
-    private $categoryTree = [];
+    private $nestedCategoriesList = [];
 
     /**
      * Assert that relations of categories in navigation menu are correct.
@@ -37,25 +42,24 @@ public function processAssert(
         Category $childCategory,
         Category $parentCategory
     ) {
-
         do {
             $name = $bottomChildCategory->getName();
             if ($name !== $childCategory->getName()) {
-                $this->categoryTree[] = $name;
+                $this->nestedCategoriesList[] = $name;
                 $bottomChildCategory = $bottomChildCategory->getDataFieldConfig('parent_id')['source']
                     ->getParentCategory();
             } else {
-                $this->categoryTree[] = $childCategory->getName();
+                $this->nestedCategoriesList[] = $childCategory->getName();
                 break;
             }
         } while ($name);
 
-        if ($parentCategory->getName() !== 'Default Category') {
-            $this->categoryTree[] = $parentCategory->getName();
+        if ($parentCategory->getName() !== self::DEFAULT_CATEGORY_NAME) {
+            $this->nestedCategoriesList[] = $parentCategory->getName();
         }
         $cmsIndex->open();
 
-        foreach (array_reverse($this->categoryTree) as $category) {
+        foreach (array_reverse($this->nestedCategoriesList) as $category) {
             $cmsIndex->getTopMenu()->hoverCategoryByName($category);
             \PHPUnit_Framework_Assert::assertTrue(
                 $cmsIndex->getTopMenu()->isCategoryVisible($category),
@@ -71,6 +75,6 @@ public function processAssert(
      */
     public function toString()
     {
-        return 'Topmenu contains correct tree of categories';
+        return 'Topmenu contains correct tree of categories.';
     }
 }

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

@@ -66,17 +66,17 @@ public function __inject(
      *
      * @param Category $childCategory
      * @param Category $parentCategory
-     * @param array|null $moveLevel
+     * @param array $moveLevel
      * @return array
      */
-    public function test(Category $childCategory, Category $parentCategory, array $moveLevel = null)
+    public function test(Category $childCategory, Category $parentCategory, array $moveLevel = [])
     {
         // Preconditions:
         $parentCategory->persist();
         $childCategory->persist();
         $bottomChildCategory = $childCategory;
 
-        if ($moveLevel !== null) {
+        if (!empty($moveLevel)) {
             for ($nestingIterator = 1; $nestingIterator < $moveLevel['child']; $nestingIterator++) {
                 $childCategory = $childCategory->getDataFieldConfig('parent_id')['source']->getParentCategory();
             }

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

@@ -55,14 +55,14 @@ class Navigation extends Block
      *
      * @var string
      */
-    protected $categoryName = './/li[@class="item"]//a[contains(text(),"%s")]';
+    private $categoryName = './/li[@class="item"]//a[contains(text(),"%s")]';
 
     /**
      * Locator for element with product quantity.
      *
      * @var string
      */
-    protected $productQty = '/following-sibling::span[contains(text(), "%s")]';
+    private $productQty = '/following-sibling::span[contains(text(), "%s")]';
 
     /**
      * Remove all applied filters.

dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertCategoryLayeredNavigation.php

@@ -7,7 +7,6 @@
 namespace Magento\LayeredNavigation\Test\Constraint;
 
 use Magento\Mtf\Client\BrowserInterface;
-use Magento\Mtf\Fixture\FixtureInterface;
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\Mtf\Constraint\AbstractConstraint;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
@@ -22,7 +21,7 @@ class AssertCategoryLayeredNavigation extends AbstractConstraint
      *
      * @var BrowserInterface
      */
-    protected $browser;
+    private $browser;
 
     /**
      * Assert that category is present in layered navigation and product is visible in product grid.
@@ -63,7 +62,7 @@ public function processAssert(
      * @param Category $category
      * @return void
      */
-    protected function openCategory(Category $category)
+    private function openCategory(Category $category)
     {
         $categoryUrlKey = [];
 

dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Topmenu.php

@@ -10,7 +10,8 @@
 use Magento\Mtf\Client\Locator;
 
 /**
- * Class top menu navigation block.
+ * Class Topmenu
+ * Class top menu navigation block
  */
 class Topmenu extends Block
 {
@@ -43,7 +44,7 @@ class Topmenu extends Block
     protected $navigationMenuItems = "/li";
 
     /**
-     * Select category from top menu by name and click on it.
+     * Select category from top menu by name and click on it
      *
      * @param string $categoryName
      * @return void
@@ -61,7 +62,7 @@ function () use ($category) {
         }
         $category[0]->click();
     }
-    
+
     /**
      * Hover on category from top menu by name.
      *
@@ -83,7 +84,7 @@ function () use ($category) {
     }
 
     /**
-     * Check is visible category in top menu by name.
+     * Check is visible category in top menu by name
      *
      * @param string $categoryName
      * @return bool
@@ -94,7 +95,7 @@ public function isCategoryVisible($categoryName)
     }
 
     /**
-     * Wait for load top menu.
+     * Wait for load top menu
      *
      * @param string $categoryName
      * @return array
@@ -119,7 +120,7 @@ function () use ($rootElement, $moreCategoriesLink, $submenu) {
     }
 
     /**
-     * Check menu items count.
+     * Check menu items count
      *
      * @param int $number
      * @return bool