MC-29126: Admin: Create/update/delete configurable product

Author: mykhailomatiola

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/Adminhtml/ProductTest.php

@@ -17,17 +17,18 @@
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Eav\Model\Config;
 use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Message\MessageInterface;
 use Magento\Framework\Registry;
-use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Serialize\SerializerInterface;
 use Magento\TestFramework\TestCase\AbstractBackendController;
 
 /**
  * Tests for configurable product admin save.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @magentoAppArea adminhtml
- * @magentoDbIsolation disabled
+ * @magentoDbIsolation enabled
  */
 class ProductTest extends AbstractBackendController
 {
@@ -39,15 +40,15 @@ class ProductTest extends AbstractBackendController
     /**
      * @var ProductAttributeRepositoryInterface
      */
-    private $attributeRepository;
+    private $productAttributeRepository;
 
     /**
      * @var Registry
      */
     private $registry;
 
     /**
-     * @var Json
+     * @var SerializerInterface
      */
     private $jsonSerializer;
 
@@ -63,9 +64,9 @@ protected function setUp()
     {
         parent::setUp();
         $this->productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
-        $this->attributeRepository = $this->_objectManager->create(ProductAttributeRepositoryInterface::class);
+        $this->productAttributeRepository = $this->_objectManager->create(ProductAttributeRepositoryInterface::class);
         $this->registry = $this->_objectManager->get(Registry::class);
-        $this->jsonSerializer = $this->_objectManager->get(Json::class);
+        $this->jsonSerializer = $this->_objectManager->get(SerializerInterface::class);
         $this->eavConfig = $this->_objectManager->get(Config::class);
     }
 
@@ -86,7 +87,7 @@ public function testSaveActionAssociatedProductIds(): void
             ]
         );
         $this->dispatch('backend/catalog/product/save');
-        $this->assertSessionMessages($this->equalTo(['You saved the product.']), MessageInterface::TYPE_SUCCESS);
+        $this->assertSessionMessages($this->equalTo([__('You saved the product.')]), MessageInterface::TYPE_SUCCESS);
         $this->assertRegistryConfigurableLinks($associatedProductIds);
         $this->assertConfigurableLinks('configurable', $associatedProductIds);
     }
@@ -101,10 +102,11 @@ public function testSaveNewProduct(array $childProducts): void
     {
         $this->serRequestParams($childProducts);
         $this->dispatch('backend/catalog/product/save');
-        $this->assertSessionMessages($this->equalTo(['You saved the product.']), MessageInterface::TYPE_SUCCESS);
+        $this->assertSessionMessages($this->equalTo([__('You saved the product.')]), MessageInterface::TYPE_SUCCESS);
         $this->assertChildProducts($childProducts);
         $this->assertConfigurableOptions('configurable', $childProducts);
         $this->assertConfigurableLinks('configurable', $this->getProductIds(array_keys($childProducts)));
+        $this->deleteProducts(array_merge(array_keys($childProducts), ['configurable']));
     }
 
     /**
@@ -174,6 +176,7 @@ public function testSaveExistProduct(array $childProducts, array $associatedProd
             'configurable',
             $this->getProductIds(array_merge($associatedProducts, array_keys($childProducts)))
         );
+        $this->deleteProducts(array_merge($associatedProducts, array_keys($childProducts)));
     }
 
     /**
@@ -483,11 +486,11 @@ private function getDefaultAttributeSetId(): int
      */
     private function getAttribute(string $attributeCode): ProductAttributeInterface
     {
-        return $this->attributeRepository->get($attributeCode);
+        return $this->productAttributeRepository->get($attributeCode);
     }
 
     /**
-     * Returns product ids by sku list.
+     * Returns products by sku list.
      *
      * @param array $skuList
      * @return ProductInterface[]
@@ -517,4 +520,25 @@ private function getProductIds(array $skuList): array
 
         return $associatedProductIds;
     }
+
+    /**
+     * @param array $skuList
+     * @return void
+     */
+    private function deleteProducts(array $skuList): void
+    {
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', true);
+
+        foreach ($skuList as $sku) {
+            try {
+                $product = $this->productRepository->get($sku, false, null, true);
+                $this->productRepository->delete($product);
+            } catch (NoSuchEntityException $e) {
+                //Product already removed
+            }
+        }
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', false);
+    }
 }

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

@@ -5,25 +5,36 @@
  */
 declare(strict_types=1);
 
+use Magento\Catalog\Api\Data\ProductExtensionInterfaceFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ProductFactory;
 use Magento\ConfigurableProduct\Helper\Product\Options\Factory;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Store\Api\WebsiteRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
 require __DIR__ . '/configurable_attribute.php';
 $objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
 $productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
-$productFactory = $objectManager->create(ProductFactory::class);
-$optionsFactory = $objectManager->create(Factory::class);
+/** @var ProductFactory $productFactory */
+$productFactory = $objectManager->get(ProductFactory::class);
+/** @var Factory $optionsFactory */
+$optionsFactory = $objectManager->get(Factory::class);
+/** @var  ProductExtensionInterfaceFactory $productExtensionAttributes */
+$productExtensionAttributesFactory = $objectManager->get(ProductExtensionInterfaceFactory::class);
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->create(WebsiteRepositoryInterface::class);
+$defaultWebsiteId = $websiteRepository->get('base')->getId();
 
 $option = $attribute->getSource()->getOptionId('Option 1');
 $product = $productFactory->create();
 $product->setTypeId(Type::TYPE_SIMPLE)
     ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([$defaultWebsiteId])
     ->setName('Configurable Option 1')
     ->setSku('simple_1')
     ->setPrice(10.00)
@@ -44,15 +55,15 @@
         ],
     ]
 );
-$extensionConfigurableAttributes = $product->getExtensionAttributes();
+$extensionConfigurableAttributes = $product->getExtensionAttributes() ?: $productExtensionAttributesFactory->create();
 $extensionConfigurableAttributes->setConfigurableProductOptions($configurableOptions);
 $extensionConfigurableAttributes->setConfigurableProductLinks([$product->getId()]);
 
 $configurableProduct = $productFactory->create();
 $configurableProduct->setExtensionAttributes($extensionConfigurableAttributes);
 $configurableProduct->setTypeId(Configurable::TYPE_CODE)
     ->setAttributeSetId($configurableProduct->getDefaultAttributeSetId())
-    ->setWebsiteIds([1])
+    ->setWebsiteIds([$defaultWebsiteId])
     ->setName('Configurable Product')
     ->setSku('configurable')
     ->setVisibility(Visibility::VISIBILITY_BOTH)

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

@@ -11,20 +11,22 @@
 use Magento\TestFramework\Helper\Bootstrap;
 
 $objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
 $registry = $objectManager->get(Registry::class);
+/** @var ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->get(ProductRepositoryInterface::class);
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-foreach (['simple_1','simple_2','simple_1_1','simple_1_2', 'simple_2_1','simple_2_2', 'configurable'] as $sku) {
+foreach (['simple_1', 'configurable'] as $sku) {
     try {
-        $product = $productRepository->get($sku, false, null, true);
+        $product = $productRepository->get($sku);
         $productRepository->delete($product);
     } catch (NoSuchEntityException $e) {
         //Product already removed
     }
 }
 
-require __DIR__ . '/configurable_attribute_rollback.php';
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
+require __DIR__ . '/configurable_attribute_rollback.php';