MC-29293: Storefront: Configurable Product with Out Of Stock Child(s)

Author: ysapiga

dev/tests/integration/framework/Magento/TestFramework/ConfigurableProduct/Model/DeleteConfigurableProduct.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\ConfigurableProduct\Model;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+
+/**
+ * Delete configurable product with linked products
+ */
+class DeleteConfigurableProduct
+{
+    /** @var ProductRepositoryInterface */
+    private $productRepository;
+
+    /** @var ProductResource */
+    private $productResource;
+
+    /** @var Registry */
+    private $registry;
+
+    /**
+     * @param ProductRepositoryInterface $productRepository
+     * @param ProductResource $productResource
+     */
+    public function __construct(
+        ProductRepositoryInterface $productRepository,
+        ProductResource $productResource,
+        Registry $registry
+    ) {
+        $this->productRepository = $productRepository;
+        $this->productResource = $productResource;
+        $this->registry = $registry;
+    }
+
+    /**
+     * Delete configurable product and linked products
+     *
+     * @param string $sku
+     * @return void
+     */
+    public function execute(string $sku): void
+    {
+        $configurableProduct = $this->productRepository->get($sku, false, null, true);
+        $childrenIds = $configurableProduct->getExtensionAttributes()->getConfigurableProductLinks();
+        $childrenSkus = $this->productResource->getProductsSku($childrenIds);
+        $childrenSkus[]['sku'] = $sku;
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', true);
+        foreach ($childrenSkus as $childSku) {
+            try {
+                $this->productRepository->deleteById($childSku['sku']);
+            } catch (NoSuchEntityException $e) {
+                //product already removed
+            }
+        }
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', false);
+    }
+}

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableViewOnCategoryPageTest.php

@@ -19,6 +19,7 @@
  *
  * @magentoDbIsolation disabled
  * @magentoAppIsolation enabled
+ * @magentoAppArea frontend
  * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_product_with_out_of_stock_children.php
  */
 class ConfigurableViewOnCategoryPageTest extends TestCase

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableViewOnProductPageTest.php

@@ -49,6 +49,9 @@ class ConfigurableViewOnProductPageTest extends TestCase
     /** @var ProductResource */
     private $productResource;
 
+    /** @var StoreManagerInterface */
+    private $storeManager;
+
     /**
      * @inheritdoc
      */
@@ -63,6 +66,7 @@ protected function setUp()
         $this->block = $this->layout->createBlock(Configurable::class);
         $this->json = $this->objectManager->get(SerializerInterface::class);
         $this->productResource = $this->objectManager->get(ProductResource::class);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
     }
 
     /**
@@ -76,7 +80,7 @@ protected function setUp()
      */
     public function testOneChildNotVisible(string $sku, array $data, array $expectedData): void
     {
-        $configurableProduct = $this->prepareProductToTest($sku, $data);
+        $configurableProduct = $this->prepareConfigurableProduct($sku, $data);
         $result = $this->renderStockBlock($configurableProduct);
         $this->performAsserts($result, $expectedData);
     }
@@ -142,7 +146,7 @@ public function testOneChildNotVisibleWithEnabledShowOutOfStockProducts(
         array $data,
         array $expectedData
     ): void {
-        $configurableProduct = $this->prepareProductToTest($sku, $data);
+        $configurableProduct = $this->prepareConfigurableProduct($sku, $data);
         $result = $this->renderStockBlock($configurableProduct);
         $this->performAsserts($result, $expectedData);
     }
@@ -206,34 +210,34 @@ public function oneChildNotVisibleDataProviderWithEnabledConfig(): array
      */
     private function updateProduct(string $sku, array $data): void
     {
-        $storeManager = $this->objectManager->get(StoreManagerInterface::class);
-        $currentStore = $storeManager->getStore();
+        $currentStore = $this->storeManager->getStore();
         try {
-            $storeManager->setCurrentStore(Store::DEFAULT_STORE_ID);
+            $this->storeManager->setCurrentStore(Store::DEFAULT_STORE_ID);
             $product = $this->productRepository->get($sku);
             $product->addData($data);
             $this->productRepository->save($product);
         } finally {
-            $storeManager->setCurrentStore($currentStore);
+            $this->storeManager->setCurrentStore($currentStore);
         }
     }
 
     /**
      * Check attribute options
      *
-     * @param array $actualAttributeDataData
-     * @param array $actualOptionData
+     * @param array $actualData
      * @param array $expectedData
      * @return void
      */
-    private function assertConfig(array $actualAttributeDataData, array $actualOptionData, array $expectedData): void
+    private function assertConfig(array $actualData, array $expectedData): void
     {
-        $this->assertCount(count($expectedData), $actualOptionData, 'Redundant options were loaded');
+        $this->assertCount(count($expectedData), $actualData['options_data'], 'Redundant options were loaded');
+        $sku = array_column($expectedData, 'product');
+        $idBySkuMapping = $this->productResource->getProductsIdsBySkus($sku);
         foreach ($expectedData as $expectedOption) {
-            $expectedId = $this->productResource->getIdBySku($expectedOption['product']);
-            $itemToCheck = $actualOptionData[$expectedId] ?? null;
+            $expectedId = $idBySkuMapping[$expectedOption['product']];
+            $itemToCheck = $actualData['options_data'][$expectedId] ?? null;
             $this->assertNotNull($itemToCheck);
-            foreach ($actualAttributeDataData['options'] as $actualAttributeDataItem) {
+            foreach ($actualData['attributes']['options'] as $actualAttributeDataItem) {
                 if ($actualAttributeDataItem['id'] === reset($itemToCheck)) {
                     $this->assertEquals($expectedOption['label'], $actualAttributeDataItem['label']);
                 }
@@ -266,7 +270,8 @@ private function performAsserts(string $result, array $expectedData): void
     {
         $this->assertEquals((string)__($expectedData['stock_status']), trim(strip_tags($result)));
         $config = $this->json->unserialize($this->block->getJsonConfig());
-        $this->assertConfig(reset($config['attributes']), $config['index'], $expectedData['options']);
+        $dataToCheck = ['attributes' => reset($config['attributes']), 'options_data' =>  $config['index']];
+        $this->assertConfig($dataToCheck, $expectedData['options']);
     }
 
     /**
@@ -276,11 +281,10 @@ private function performAsserts(string $result, array $expectedData): void
      * @param array $data
      * @return ProductInterface
      */
-    private function prepareProductToTest(string $sku, array $data): ProductInterface
+    private function prepareConfigurableProduct(string $sku, array $data): ProductInterface
     {
         $this->updateProduct($sku, $data);
-        $configurableProduct = $this->productRepository->get('configurable', false, null, true);
 
-        return $configurableProduct;
+        return $this->productRepository->get('configurable', false, null, true);
     }
 }

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/Configurable/SalableTest.php

@@ -16,6 +16,8 @@
 
 /**
  * Check is configurable product salable with different conditions
+ *
+ * @magentoAppArea frontend
  */
 class SalableTest extends TestCase
 {

dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_product_with_out_of_stock_children_rollback.php

@@ -5,41 +5,15 @@
  */
 declare(strict_types=1);
 
-use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\Registry;
+use Magento\TestFramework\ConfigurableProduct\Model\DeleteConfigurableProduct;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /** @var ObjectManagerInterface $objectManager */
 $objectManager = Bootstrap::getObjectManager();
-/** @var Registry $registry */
-$registry = $objectManager->get(Registry::class);
-$registry->unregister('isSecureArea');
-$registry->register('isSecureArea', true);
-/** @var ProductRepositoryInterface $productRepository */
-$productRepository = $objectManager->get(ProductRepositoryInterface::class);
-/** @var ProductAttributeRepositoryInterface $productAttributeRepository */
-$productAttributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
-$attribute = $productAttributeRepository->get('test_configurable');
-$options = $attribute->getOptions();
-array_shift($options);
-$productsArray = [];
-foreach ($options as $option) {
-    $productsArray [] = strtolower(str_replace(' ', '_', 'simple ' . $option->getLabel()));
-}
-$productsArray[] = 'configurable';
-foreach ($productsArray as $sku) {
-    try {
-        $productRepository->deleteById($sku);
-    } catch (NoSuchEntityException $e) {
-        //Product already removed
-    }
-}
-
-$registry->unregister('isSecureArea');
-$registry->register('isSecureArea', false);
+/** @var DeleteConfigurableProduct $deleteConfigurableProductService */
+$deleteConfigurableProductService = $objectManager->get(DeleteConfigurableProduct::class);
+$deleteConfigurableProductService->execute('configurable');
 
 require __DIR__ . '/configurable_attribute_rollback.php';
 require __DIR__ . '/../../Catalog/_files/category_rollback.php';