PB-107: Display total number of products matched into ProductsList

- Add more simple basic test coverage

Author: davemacaulay

dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductTotalsTest.php

@@ -65,7 +65,7 @@ public function testProductTotals(
     public function productDataProvider()
     {
         return [
-            [ // category with no products
+            [ // #0 category with no products
                 ['1' => [
                     'aggregator' => 'all',
                     'new_child' => '',
@@ -80,7 +80,7 @@ public function productDataProvider()
                     ]
                 ], 0, 0, 0, 0
             ],
-            [ // category with 4 products, 1 disabled, 1 not visible
+            [ // #1 category with 4 products, 3 disabled, 3 not visible
                 ['1' => [
                     'aggregator' => 'all',
                     'new_child' => '',
@@ -93,9 +93,9 @@ public function productDataProvider()
                         'attribute' => 'category_ids',
                         'value' => '3'
                     ]
-                ], 4, 1, 1, 0
+                ], 7, 3, 3, 1
             ],
-            [ // sku with no matches
+            [ // #2 sku with no matches
                 ['1' => [
                     'aggregator' => 'all',
                     'new_child' => '',
@@ -110,7 +110,7 @@ public function productDataProvider()
                     ]
                 ], 0, 0, 0, 0
             ],
-            [ // sku with 2 matches, 1 disabled, 1 not visible
+            [ // #3 sku with 2 matches, 1 disabled, 1 not visible, 1 out of stock
                 ['1' => [
                     'aggregator' => 'all',
                     'new_child' => '',
@@ -121,11 +121,11 @@ public function productDataProvider()
                         'operator' => '()',
                         'type' => \Magento\CatalogWidget\Model\Rule\Condition\Product::class,
                         'attribute' => 'sku',
-                        'value' => 'not-visible-on-storefront, disabled-product'
+                        'value' => 'not-visible-on-storefront, disabled-product, out-of-stock'
                     ]
-                ], 2, 1, 1, 0
+                ], 3, 1, 1, 1
             ],
-            [ // condition with no matches
+            [ // #4 condition with no matches
                 ['1' => [
                     'aggregator' => 'all',
                     'new_child' => '',
@@ -140,7 +140,7 @@ public function productDataProvider()
                     ]
                 ], 0, 0, 0, 0
             ],
-            [ // condition with 3 matches, 1 disabled, 1 not visible
+            [ // #5 condition with 3 matches, 1 disabled, 1 not visible
                 ['1' => [
                     'aggregator' => 'all',
                     'new_child' => '',

dev/tests/integration/testsuite/Magento/PageBuilder/_files/product_totals/products.php

@@ -160,3 +160,61 @@ function (\Magento\Catalog\Model\Product $product) {
     $defaultAttributeSet,
     $categoryLinkManagement
 );
+
+// Create an out of stock product
+createTestProduct(
+    'Out of Stock Product',
+    'out-of-stock',
+    function (\Magento\Catalog\Model\Product $product) {
+        $product->setPrice(22.50);
+        $product->setWeight(100);
+        $product->setQuantityAndStockStatus(
+            [
+                'qty' => 0,
+                'is_in_stock' => \Magento\CatalogInventory\Model\Stock\Status::STATUS_OUT_OF_STOCK
+            ]
+        );
+        return $product;
+    },
+    $objectManager,
+    $defaultAttributeSet,
+    $categoryLinkManagement
+);
+
+// Create a disabled, not visible product
+createTestProduct(
+    'Disabled & Not Visible Product',
+    'disabled-not-visible-product',
+    function (\Magento\Catalog\Model\Product $product) {
+        $product->setPrice(45);
+        $product->setWeight(2);
+        $product->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE);
+        $product->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED);
+        return $product;
+    },
+    $objectManager,
+    $defaultAttributeSet,
+    $categoryLinkManagement
+);
+
+// Create a disabled, out of stock, not visible product
+createTestProduct(
+    'Disabled OOS Not Visible',
+    'disabled-out-of-stock-not-visible',
+    function (\Magento\Catalog\Model\Product $product) {
+        $product->setPrice(150);
+        $product->setWeight(22);
+        $product->setQuantityAndStockStatus(
+            [
+                'qty' => 0,
+                'is_in_stock' => \Magento\CatalogInventory\Model\Stock\Status::STATUS_OUT_OF_STOCK
+            ]
+        );
+        $product->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE);
+        $product->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED);
+        return $product;
+    },
+    $objectManager,
+    $defaultAttributeSet,
+    $categoryLinkManagement
+);

dev/tests/integration/testsuite/Magento/PageBuilder/_files/product_totals/products_rollback.php

@@ -14,7 +14,15 @@
 // Remove products
 /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-$productsToDelete = ['simple', '12345', 'simple-3', 'simple-4'];
+$productsToDelete = [
+    'simple',
+    '12345',
+    'not-visible-on-storefront',
+    'disabled-product',
+    'out-of-stock',
+    'disabled-not-visible-product',
+    'disabled-out-of-stock-not-visible'
+];
 
 foreach ($productsToDelete as $sku) {
     try {