MC-17765: Category A image replaced by uploading to Category B

Author: StasKozar

dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php

@@ -89,10 +89,12 @@ public function testSaveFileToTmpDir(): void
     public function testMoveFileFromTmp(): void
     {
         $expectedFileName = 'magento_small_image_1.jpg';
+        $expectedFilePath = $this->imageUploader->getBasePath() . DIRECTORY_SEPARATOR . $expectedFileName;
+
+        $this->assertFileNotExists($this->mediaDirectory->getAbsolutePath($expectedFilePath));
 
         $this->imageUploader->moveFileFromTmp('magento_small_image.jpg');
 
-        $expectedFilePath = $this->imageUploader->getBasePath() . DIRECTORY_SEPARATOR . $expectedFileName;
         $this->assertFileExists($this->mediaDirectory->getAbsolutePath($expectedFilePath));
     }
 

dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_image.php

@@ -12,18 +12,8 @@
 /** @var $mediaDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
 $mediaDirectory = $objectManager->get(\Magento\Framework\Filesystem::class)
     ->getDirectoryWrite(DirectoryList::MEDIA);
-/** @var $imageUploader \Magento\Catalog\Model\ImageUploader */
-$imageUploader = $objectManager->create(
-    \Magento\Catalog\Model\ImageUploader::class,
-    [
-        'baseTmpPath' => $mediaDirectory->getRelativePath('catalog/tmp/category'),
-        'basePath' => $mediaDirectory->getRelativePath('catalog/category'),
-        'allowedExtensions' => ['jpg', 'jpeg', 'gif', 'png'],
-        'allowedMimeTypes' => ['image/jpg', 'image/jpeg', 'image/gif', 'image/png']
-    ]
-);
 $fileName = 'magento_small_image.jpg';
-$filePath = $imageUploader->getBasePath() . DIRECTORY_SEPARATOR. $fileName;
-$mediaDirectory->create($imageUploader->getBasePath());
+$filePath = 'catalog/category/' . $fileName;
+$mediaDirectory->create('catalog/category');
 
 copy(__DIR__ . DIRECTORY_SEPARATOR . $fileName, $mediaDirectory->getAbsolutePath($filePath));

dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_image_rollback.php

@@ -13,15 +13,5 @@
 )->getDirectoryWrite(
     DirectoryList::MEDIA
 );
-/** @var $imageUploader \Magento\Catalog\Model\ImageUploader */
-$imageUploader = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    \Magento\Catalog\Model\ImageUploader::class,
-    [
-        'baseTmpPath' => $mediaDirectory->getRelativePath('catalog/tmp/category'),
-        'basePath' => $mediaDirectory->getRelativePath('catalog/category'),
-        'allowedExtensions' => ['jpg', 'jpeg', 'gif', 'png'],
-        'allowedMimeTypes' => ['image/jpg', 'image/jpeg', 'image/gif', 'image/png']
-    ]
-);
 
-$mediaDirectory->delete($imageUploader->getBasePath());
+$mediaDirectory->delete('catalog/category');

dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_tmp_category_image.php

@@ -12,17 +12,8 @@
 /** @var $mediaDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
 $mediaDirectory = $objectManager->get(\Magento\Framework\Filesystem::class)
     ->getDirectoryWrite(DirectoryList::MEDIA);
-$imageUploader = $objectManager->create(
-    \Magento\Catalog\Model\ImageUploader::class,
-    [
-        'baseTmpPath' => $mediaDirectory->getRelativePath('catalog/tmp/category'),
-        'basePath' => $mediaDirectory->getRelativePath('catalog/category'),
-        'allowedExtensions' => ['jpg', 'jpeg', 'gif', 'png'],
-        'allowedMimeTypes' => ['image/jpg', 'image/jpeg', 'image/gif', 'image/png']
-    ]
-);
 $fileName = 'magento_small_image.jpg';
-$tmpFilePath = $imageUploader->getBaseTmpPath() . DIRECTORY_SEPARATOR. $fileName;
-$mediaDirectory->create($imageUploader->getBaseTmpPath());
+$tmpFilePath = 'catalog/tmp/category/' . $fileName;
+$mediaDirectory->create('catalog/tmp/category');
 
 copy(__DIR__ . DIRECTORY_SEPARATOR . $fileName, $mediaDirectory->getAbsolutePath($tmpFilePath));

dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_tmp_category_image_rollback.php

@@ -13,15 +13,5 @@
 )->getDirectoryWrite(
     DirectoryList::MEDIA
 );
-/** @var $imageUploader \Magento\Catalog\Model\ImageUploader */
-$imageUploader = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    \Magento\Catalog\Model\ImageUploader::class,
-    [
-        'baseTmpPath' => $mediaDirectory->getRelativePath('catalog/tmp/category'),
-        'basePath' => $mediaDirectory->getRelativePath('catalog/category'),
-        'allowedExtensions' => ['jpg', 'jpeg', 'gif', 'png'],
-        'allowedMimeTypes' => ['image/jpg', 'image/jpeg', 'image/gif', 'image/png']
-    ]
-);
 
-$mediaDirectory->delete($imageUploader->getBaseTmpPath());
+$mediaDirectory->delete('catalog/tmp/category');