ENGCOM-8160: fix category image is not removed from tmp folder after …

…category save #29906 - Merge Pull Request #29906 from engcom-Golf/magento2:asi-1792 - Merged commits: 1. 70b0d06 2. 879a74e 3. b3e5989 4. 7f0a495 5. 1f733fe 6. 5584b4c 7. 86cc39c 8. b21a245
magento · Sep 9, 2020 · b8ea9b6 · b8ea9b6
2 parents d4d757b + b21a245
commit b8ea9b6
Show file tree

Hide file tree

Showing 7 changed files with 115 additions and 6 deletions.
diff --git a/app/code/Magento/MediaGalleryCatalogIntegration/Plugin/SaveBaseCategoryImageInformation.php b/app/code/Magento/MediaGalleryCatalogIntegration/Plugin/SaveBaseCategoryImageInformation.php
@@ -81,17 +81,18 @@ public function __construct(
      *
      * @param ImageUploader $subject
      * @param string $imagePath
+     * @param string $initialImageName
      * @return string
      * @throws LocalizedException
      */
-    public function afterMoveFileFromTmp(ImageUploader $subject, string $imagePath): string
+    public function afterMoveFileFromTmp(ImageUploader $subject, string $imagePath, string $initialImageName): string
     {
         if (!$this->config->isEnabled()) {
             return $imagePath;
         }
 
         $absolutePath = $this->storage->getCmsWysiwygImages()->getStorageRoot() . $imagePath;
-        $tmpPath = $subject->getBaseTmpPath() . '/' . substr(strrchr($imagePath, '/'), 1);
+        $tmpPath = $subject->getBaseTmpPath() . '/' . $initialImageName;
         $tmpAssets = $this->getAssetsByPaths->execute([$tmpPath]);
 
         if (!empty($tmpAssets)) {

diff --git a/...ryCatalogIntegration/Test/Mftf/Test/AdminUploadSameImageDeleteFromTemporaryFolderTest.xml b/...ryCatalogIntegration/Test/Mftf/Test/AdminUploadSameImageDeleteFromTemporaryFolderTest.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUploadSameImageDeleteFromTemporaryFolderTest">
+        <annotations>
+            <features value="AdminUploadSameImageDeleteFromTemporaryFolderTest"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1792"/>
+            <title value="Image is deleted from tmp folder if is uploaded second time"/>
+            <description value="Image is deleted from tmp folder if is uploaded second time"/>
+            <stories value="Image is deleted from tmp folder if is uploaded second time"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/943908/scenarios/4836631"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Upload test image to category twice -->
+        <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="AdminEditCategoryInGridPageActionGroup" stepKey="editCategoryItem">
+            <argument name="categoryName" value="$category.name$"/>
+        </actionGroup>
+        <actionGroup ref="AddCategoryImageActionGroup" stepKey="addCategoryImage"/>
+        <actionGroup ref="AdminSaveCategoryFormActionGroup" stepKey="saveCategoryForm"/>
+        <actionGroup ref="AddCategoryImageActionGroup" stepKey="addCategoryImageSecondTime"/>
+        <actionGroup ref="AdminSaveCategoryFormActionGroup" stepKey="saveCategoryFormSecondTime"/>
+
+        <!-- Open tmp/category folder -->
+        <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGallery"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryExpandCatalogTmpFolderActionGroup" stepKey="expandTmpFolder"/>
+        <actionGroup ref="AdminMediaGalleryFolderSelectByFullPathActionGroup" stepKey="selectCategoryFolder">
+            <argument name="path" value="catalog/tmp/category"/>
+        </actionGroup>
+
+        <!-- Assert folder is empty -->
+        <actionGroup ref="AdminAssertMediaGalleryEmptyActionGroup" stepKey="assertEmptyFolder"/>
+    </test>
+</tests>
diff --git a/.../Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryEmptyActionGroup.xml b/.../Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryEmptyActionGroup.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminAssertMediaGalleryEmptyActionGroup">
+        <annotations>
+            <description>Requires select folder in directory tree. Assert that selected folder is empty.</description>
+        </annotations>
+
+        <seeElement selector="{{AdminMediaGalleryGridSection.noDataMessage}}" stepKey="assertNoDataMessageDisplayed" />
+    </actionGroup>
+</actionGroups>
diff --git a/...ryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryExpandCatalogTmpFolderActionGroup.xml b/...ryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryExpandCatalogTmpFolderActionGroup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminEnhancedMediaGalleryExpandCatalogTmpFolderActionGroup">
+        <annotations>
+            <description>Expand media gallery tmp folder tree</description>
+        </annotations>
+        <waitForLoadingMaskToDisappear stepKey="waitLoadingMask"/>
+        <conditionalClick selector="//li[@id='catalog']/ins" dependentSelector="//li[@id='catalog']/ul" visible="false" stepKey="expandCatalog"/>
+        <wait time="2" stepKey="waitCatalogExpanded"/>
+        <conditionalClick selector="//li[@id='catalog/tmp']/ins" dependentSelector="//li[@id='catalog/tmp']/ul" visible="false" stepKey="expandTmp"/>
+        <wait time="2" stepKey="waitTmpExpanded"/>
+    </actionGroup>
+</actionGroups>
diff --git a/...diaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderSelectByFullPathActionGroup.xml b/...diaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderSelectByFullPathActionGroup.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminMediaGalleryFolderSelectByFullPathActionGroup">
+        <arguments>
+            <argument name="path" type="string"/>
+        </arguments>
+        <wait time="2" stepKey="waitBeforeClickOnFolder"/>
+        <click selector="//li[@id='{{path}}']" stepKey="selectSubFolder" after="waitBeforeClickOnFolder"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForFolderContents"/>
+    </actionGroup>
+</actionGroups>
diff --git a/...MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGallerySortByActionGroup.xml b/...MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGallerySortByActionGroup.xml
@@ -18,11 +18,11 @@
             <argument name="thirdImageFile" type="string"/>
         </arguments>
 
-        <grabAttributeFrom selector="{{AdminEnhancedMediaGalleryGridImagePositionSection.nthImageInGrid('0')}}" userInput="src"
+        <grabAttributeFrom selector="{{AdminMediaGalleryGridSection.nthImageInGrid('0')}}" userInput="src"
                            stepKey="getFirstImageSrcAfterSort"/>
-        <grabAttributeFrom selector="{{AdminEnhancedMediaGalleryGridImagePositionSection.nthImageInGrid('1')}}" userInput="src"
+        <grabAttributeFrom selector="{{AdminMediaGalleryGridSection.nthImageInGrid('1')}}" userInput="src"
                            stepKey="getSecondImageSrcAfterSort"/>
-        <grabAttributeFrom selector="{{AdminEnhancedMediaGalleryGridImagePositionSection.nthImageInGrid('2')}}" userInput="src"
+        <grabAttributeFrom selector="{{AdminMediaGalleryGridSection.nthImageInGrid('2')}}" userInput="src"
                            stepKey="getThirdImageSrcAfterSort"/>
 
         <assertStringContainsString stepKey="assertFirstImagePositionAfterSort">

diff --git a/...dMediaGalleryGridImagePositionSection.xml → .../Section/AdminMediaGalleryGridSection.xml b/...dMediaGalleryGridImagePositionSection.xml → .../Section/AdminMediaGalleryGridSection.xml
@@ -7,7 +7,8 @@
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-    <section name="AdminEnhancedMediaGalleryGridImagePositionSection">
+    <section name="AdminMediaGalleryGridSection">
+        <element name="noDataMessage" type="text" selector="div.no-data-message-container"/>
         <element name="nthImageInGrid" type="text" selector="div[class='masonry-image-column'][data-repeat-index='{{row}}'] img" parameterized="true"/>
     </section>
 </sections>