MC-20449: [Integration Test]Hide product images via hide_from_product_page attribute during import CSV

Author: OlgaVasyltsun

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php

@@ -976,7 +976,7 @@ public static function mediaImportImageFixtureRollback()
 
         /** @var \Magento\Framework\Filesystem\Directory\Write $varDirectory */
         $varDirectory = $fileSystem->getDirectoryWrite(DirectoryList::VAR_DIR);
-        $varDirectory->delete('import' . DIRECTORY_SEPARATOR . 'images');
+        $varDirectory->delete('import');
         $mediaDirectory->delete('catalog');
     }
 
@@ -2626,43 +2626,33 @@ public function testImagesAreHiddenAfterImport(): void
         $actualAllProductImages = [];
         $product = $this->getProductBySku('simple');
 
-//        Check that new images are imported and existing image is disabled after import
+        // Check that new images are imported and existing image is disabled after import
         $productMediaData = $product->getData('media_gallery');
 
-        if (is_array($productMediaData['images'])) {
-            $allProductImages = $productMediaData['images'];
-            $this->assertCount(3, $allProductImages, 'Images are imported incorrect');
+        $this->assertNotEmpty($productMediaData['images']);
+        $allProductImages = $productMediaData['images'];
+        $this->assertCount(3, $allProductImages, 'Images are imported incorrect');
 
-            foreach ($allProductImages as $image) {
-                $actualAllProductImages[] = [
-                    'file' => $image['file'],
-                    'label' => $image['label'],
-                    'disabled' => $image['disabled'],
-                ];
-            }
+        foreach ($allProductImages as $image) {
+            $actualAllProductImages[] = [
+                'file' => $image['file'],
+                'label' => $image['label'],
+                'disabled' => $image['disabled'],
+            ];
         }
 
         $this->assertEquals(
             $expectedAllProductImages,
             $actualAllProductImages,
-            'Images statuses are incorrect after import'
+            'Images are incorrect after import'
         );
 
-//        Check that on storefront only enabled images are shown
-        $actualActiveImages = array_values($product->getMediaGalleryImages()->getItems());
-        $this->assertCount(2, $actualActiveImages);
-
-        foreach ($actualActiveImages as $actualActiveImage) {
-            $this->assertNotEquals(
-                $expectedHiddenImage['file'],
-                $actualActiveImage->getFile(),
-                'Image should be hidden after import'
-            );
-            $this->assertNotEquals(
-                $expectedHiddenImage['label'],
-                $actualActiveImage->getLabel(),
-                'Image should be hidden after import'
-            );
-        }
+        // Check that on storefront only enabled images are shown
+        $actualActiveImages = $product->getMediaGalleryImages();
+        $this->assertSame(
+            $expectedActiveImages,
+            $actualActiveImages->toArray(['file', 'label', 'disabled'])['items'],
+            'Hidden image is present on frontend after import'
+        );
     }
 }

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_with_filesystem_images_rollback.php

@@ -4,11 +4,17 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Framework\Filesystem\Directory\Write $mediaDirectory */
-$mediaDirectory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+/** @var \Magento\Framework\Filesystem $fileSystem */
+$fileSystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
     \Magento\Framework\Filesystem::class
-)->getDirectoryWrite(
+);
+/** @var \Magento\Framework\Filesystem\Directory\Write $mediaDirectory */
+$mediaDirectory = $fileSystem->getDirectoryWrite(
     \Magento\Framework\App\Filesystem\DirectoryList::MEDIA
 );
-$mediaDirectory->delete('import');
+/** @var \Magento\Framework\Filesystem\Directory\Write $varDirectory */
+$varDirectory = $fileSystem->getDirectoryWrite(
+    \Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR
+);
+$varDirectory->delete('import');
 $mediaDirectory->delete('catalog');