Skip to content

Commit 666e95b

Browse files
committed
MC-17765: Category A image replaced by uploading to Category B
1 parent 573798c commit 666e95b

File tree

5 files changed

+9
-46
lines changed

5 files changed

+9
-46
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,12 @@ public function testSaveFileToTmpDir(): void
8989
public function testMoveFileFromTmp(): void
9090
{
9191
$expectedFileName = 'magento_small_image_1.jpg';
92+
$expectedFilePath = $this->imageUploader->getBasePath() . DIRECTORY_SEPARATOR . $expectedFileName;
93+
94+
$this->assertFileNotExists($this->mediaDirectory->getAbsolutePath($expectedFilePath));
9295

9396
$this->imageUploader->moveFileFromTmp('magento_small_image.jpg');
9497

95-
$expectedFilePath = $this->imageUploader->getBasePath() . DIRECTORY_SEPARATOR . $expectedFileName;
9698
$this->assertFileExists($this->mediaDirectory->getAbsolutePath($expectedFilePath));
9799
}
98100

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,8 @@
1212
/** @var $mediaDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
1313
$mediaDirectory = $objectManager->get(\Magento\Framework\Filesystem::class)
1414
->getDirectoryWrite(DirectoryList::MEDIA);
15-
/** @var $imageUploader \Magento\Catalog\Model\ImageUploader */
16-
$imageUploader = $objectManager->create(
17-
\Magento\Catalog\Model\ImageUploader::class,
18-
[
19-
'baseTmpPath' => $mediaDirectory->getRelativePath('catalog/tmp/category'),
20-
'basePath' => $mediaDirectory->getRelativePath('catalog/category'),
21-
'allowedExtensions' => ['jpg', 'jpeg', 'gif', 'png'],
22-
'allowedMimeTypes' => ['image/jpg', 'image/jpeg', 'image/gif', 'image/png']
23-
]
24-
);
2515
$fileName = 'magento_small_image.jpg';
26-
$filePath = $imageUploader->getBasePath() . DIRECTORY_SEPARATOR. $fileName;
27-
$mediaDirectory->create($imageUploader->getBasePath());
16+
$filePath = 'catalog/category/' . $fileName;
17+
$mediaDirectory->create('catalog/category');
2818

2919
copy(__DIR__ . DIRECTORY_SEPARATOR . $fileName, $mediaDirectory->getAbsolutePath($filePath));

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,5 @@
1313
)->getDirectoryWrite(
1414
DirectoryList::MEDIA
1515
);
16-
/** @var $imageUploader \Magento\Catalog\Model\ImageUploader */
17-
$imageUploader = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
18-
\Magento\Catalog\Model\ImageUploader::class,
19-
[
20-
'baseTmpPath' => $mediaDirectory->getRelativePath('catalog/tmp/category'),
21-
'basePath' => $mediaDirectory->getRelativePath('catalog/category'),
22-
'allowedExtensions' => ['jpg', 'jpeg', 'gif', 'png'],
23-
'allowedMimeTypes' => ['image/jpg', 'image/jpeg', 'image/gif', 'image/png']
24-
]
25-
);
2616

27-
$mediaDirectory->delete($imageUploader->getBasePath());
17+
$mediaDirectory->delete('catalog/category');

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,8 @@
1212
/** @var $mediaDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
1313
$mediaDirectory = $objectManager->get(\Magento\Framework\Filesystem::class)
1414
->getDirectoryWrite(DirectoryList::MEDIA);
15-
$imageUploader = $objectManager->create(
16-
\Magento\Catalog\Model\ImageUploader::class,
17-
[
18-
'baseTmpPath' => $mediaDirectory->getRelativePath('catalog/tmp/category'),
19-
'basePath' => $mediaDirectory->getRelativePath('catalog/category'),
20-
'allowedExtensions' => ['jpg', 'jpeg', 'gif', 'png'],
21-
'allowedMimeTypes' => ['image/jpg', 'image/jpeg', 'image/gif', 'image/png']
22-
]
23-
);
2415
$fileName = 'magento_small_image.jpg';
25-
$tmpFilePath = $imageUploader->getBaseTmpPath() . DIRECTORY_SEPARATOR. $fileName;
26-
$mediaDirectory->create($imageUploader->getBaseTmpPath());
16+
$tmpFilePath = 'catalog/tmp/category/' . $fileName;
17+
$mediaDirectory->create('catalog/tmp/category');
2718

2819
copy(__DIR__ . DIRECTORY_SEPARATOR . $fileName, $mediaDirectory->getAbsolutePath($tmpFilePath));

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,5 @@
1313
)->getDirectoryWrite(
1414
DirectoryList::MEDIA
1515
);
16-
/** @var $imageUploader \Magento\Catalog\Model\ImageUploader */
17-
$imageUploader = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
18-
\Magento\Catalog\Model\ImageUploader::class,
19-
[
20-
'baseTmpPath' => $mediaDirectory->getRelativePath('catalog/tmp/category'),
21-
'basePath' => $mediaDirectory->getRelativePath('catalog/category'),
22-
'allowedExtensions' => ['jpg', 'jpeg', 'gif', 'png'],
23-
'allowedMimeTypes' => ['image/jpg', 'image/jpeg', 'image/gif', 'image/png']
24-
]
25-
);
2616

27-
$mediaDirectory->delete($imageUploader->getBaseTmpPath());
17+
$mediaDirectory->delete('catalog/tmp/category');

0 commit comments

Comments
 (0)