ENGCOM-1060: [Backport 2.3] Added Visibility and Status filter to category product grid #12577

Author: Stanislav Idolov

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

@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\Category;
@@ -51,48 +53,42 @@ public function processAssert(
      * @param array $categoryProducts
      * @param CatalogCategoryEdit $catalogCategoryEdit
      * @param string $filterField
+     * @return void
      */
     private function testGridFilter(array $categoryProducts, CatalogCategoryEdit $catalogCategoryEdit, $filterField)
     {
-        $productsByFilter = [];
+        $expectedProducts = [];
         foreach ($categoryProducts as $product) {
-            $filterValue = $product->getData($filterField);
-            if (!isset($productsByFilter[$filterValue])) {
-                $productsByFilter[$filterValue] = [];
-            }
-            $productsByFilter[$filterValue][] = $product;
+            $expectedProducts[$product->getData('name')] = [
+                'filter' => $filterField,
+                'value' => $product->getData($filterField)
+            ];
         }
 
+        $actualProducts = [];
+        /** @var \Magento\Catalog\Test\Block\Adminhtml\Category\Edit\CategoryForm $productsFieldset */
         $productsFieldset = $catalogCategoryEdit->getEditForm()->getSection('category_products');
-        foreach ($productsByFilter as $filterValue => $products) {
-            $productsFieldset->getProductGrid()->search([
-                'in_category' => 'Yes',
-                $filterField => $filterValue,
-            ]);
-
-            $expectedRows = [];
-            foreach ($products as $product) {
-                $expectedRows[] = $product->getName();
-            }
-            $gridRows = $productsFieldset->getProductGrid()->getRowsData(['name']);
-            $actualRows = array_column($gridRows, 'name');
-            sort($expectedRows);
-            sort($actualRows);
-
-            \PHPUnit_Framework_Assert::assertEquals(
-                $expectedRows,
-                $actualRows,
-                "Category products grid filter '$filterField' does not work correctly"
-            );
+        $gridRows = $productsFieldset->getProductGrid()->getRowsData(['name', $filterField]);
+        foreach ($gridRows as $row) {
+            $actualProducts[$row['name']] = [
+                'filter' => $filterField,
+                'value' => $row[$filterField]
+            ];
         }
+
+        \PHPUnit\Framework\Assert::assertEquals(
+            $expectedProducts,
+            $actualProducts,
+            "Category products grid filter '$filterField' does not work correctly"
+        );
     }
 
     /**
      * Returns a string representation of the object.
      *
      * @return string
      */
-    public function toString()
+    public function toString() : string
     {
         return 'Category products grid filter works correctly';
     }