MC-29265: Admin: Add/delete image(s) from configurable product and its child products

Author: mykhailomatiola

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/HelperTest.php

@@ -101,7 +101,7 @@ protected function setUp()
         $this->productRepository->cleanCache();
         $this->productResource =$this->objectManager->get(ProductResource::class);
         $this->productAttributeRepository = $this->objectManager->create(ProductAttributeRepositoryInterface::class);
-        $this->jsonSerializer = $this->objectManager->create(SerializerInterface::class);
+        $this->jsonSerializer = $this->objectManager->get(SerializerInterface::class);
         $this->searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
         $this->config = $this->objectManager->get(Config::class);
         $this->mediaDirectory = $this->objectManager->get(Filesystem::class)->getDirectoryWrite(DirectoryList::MEDIA);
@@ -130,12 +130,12 @@ public function testInitialize(array $childProducts, array $expectedImages): voi
      *
      * @magentoDataFixture Magento/Catalog/_files/product_image.php
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
-     * @dataProvider initializeWithExistChildImagesDataProvider
+     * @dataProvider initializeWithExistingChildImagesDataProvider
      * @param array $childProducts
      * @param array $expectedImages
      * @return void
      */
-    public function testInitializeWithExistChildImages(array $childProducts, array $expectedImages): void
+    public function testInitializeWithExistingChildImages(array $childProducts, array $expectedImages): void
     {
         $this->updateChildProductsImages(
             [
@@ -248,7 +248,7 @@ public function initializeDataProvider(): array
     /**
      * @return array
      */
-    public function initializeWithExistChildImagesDataProvider(): array
+    public function initializeWithExistingChildImagesDataProvider(): array
     {
         $dataProvider = $this->initializeDataProvider();
         unset($dataProvider['children_with_different_images'], $dataProvider['children_with_different_image_roles']);
@@ -348,7 +348,8 @@ private function updateChildProductsImages(array $imageNames): void
     {
         $simpleIds = $this->configurableProduct->getExtensionAttributes()->getConfigurableProductLinks();
         $criteria = $this->searchCriteriaBuilder->addFilter('entity_id', $simpleIds, 'in')->create();
-        foreach ($this->productRepository->getList($criteria)->getItems() as $simpleProduct) {
+        $products = $this->productRepository->getList($criteria)->getItems();
+        foreach ($products as $simpleProduct) {
             $simpleProduct->setStoreId(Store::DEFAULT_STORE_ID)
                 ->setImage($imageNames[$simpleProduct->getSku()])
                 ->setSmallImage($imageNames[$simpleProduct->getSku()])

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/VariationHandlerTest.php

@@ -58,7 +58,6 @@ protected function setUp()
         $this->productRepository->cleanCache();
         $this->variationHandler = $this->objectManager->create(VariationHandler::class);
         $this->product = $this->productRepository->get('configurable');
-        $this->product->setTypeInstance($this->objectManager->create(Configurable::class));
         $this->stockRegistry = $this->objectManager->get(StockRegistryInterface::class);
     }
 
@@ -71,10 +70,10 @@ protected function setUp()
     public function testGenerateSimpleProducts(array $productsData): void
     {
         $this->product->setImage('some_test_image.jpg')
-        ->setSmallImage('some_test_image.jpg')
-        ->setThumbnail('some_test_image.jpg')
-        ->setSwatchImage('some_test_image.jpg')
-        ->setNewVariationsAttributeSetId($this->product->getDefaultAttributeSetId());
+            ->setSmallImage('some_test_image.jpg')
+            ->setThumbnail('some_test_image.jpg')
+            ->setSwatchImage('some_test_image.jpg')
+            ->setNewVariationsAttributeSetId($this->product->getDefaultAttributeSetId());
         $generatedProducts = $this->variationHandler->generateSimpleProducts($this->product, $productsData);
         $this->assertEquals(3, count($generatedProducts));
         foreach ($generatedProducts as $productId) {