Merge pull request #6989 from magento-arcticfoxes/B2B-1887-1889

[Arcticfoxes] S3 compatibility fixes B2B-1887, B2B-1889
magento · Jul 31, 2021 · 2c94da6 · 2c94da6
2 parents 39e1300 + 221028e
commit 2c94da6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -574,7 +574,7 @@ public function uploadFile($targetPath, $type = null)
         }
 
         // create thumbnail
-        $this->resizeFile($targetPath . '/' . ltrim($uploader->getUploadedFileName(), '/'), true);
+        $this->resizeFile(rtrim($targetPath, '/') . '/' . ltrim($uploader->getUploadedFileName(), '/'), true);
 
         return $result;
     }

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameAToZTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameAToZTest.xml
@@ -46,19 +46,19 @@
             <argument name="image" value="ImageUpload"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
-            <argument name="image" value="ImageUpload_1"/>
+            <argument name="image" value="ImageUpload1"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
-            <argument name="image" value="ImageUpload1"/>
+            <argument name="image" value="ImageUpload3"/>
         </actionGroup>
         <waitForPageLoad stepKey="waitForGridToLoad"/>
         <actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByNameAToZ">
             <argument name="sortName" value="name_az"/>
         </actionGroup>
         <actionGroup ref="AssertAdminEnhancedMediaGallerySortByActionGroup" stepKey="assertImagePositionAfterSortByNameAToZ">
             <argument name="firstImageFile" value="{{ImageUpload.file}}"/>
-            <argument name="secondImageFile" value="{{ImageUpload_1.file}}"/>
-            <argument name="thirdImageFile" value="{{ImageUpload1.value}}"/>
+            <argument name="secondImageFile" value="{{ImageUpload1.value}}"/>
+            <argument name="thirdImageFile" value="{{ImageUpload3.value}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameZToATest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameZToATest.xml
@@ -46,18 +46,18 @@
             <argument name="image" value="ImageUpload"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
-            <argument name="image" value="ImageUpload_1"/>
+            <argument name="image" value="ImageUpload1"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
-            <argument name="image" value="ImageUpload1"/>
+            <argument name="image" value="ImageUpload3"/>
         </actionGroup>
         <waitForPageLoad stepKey="waitForGridToLoad"/>
         <actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByNameZToA">
             <argument name="sortName" value="name_za"/>
         </actionGroup>
         <actionGroup ref="AssertAdminEnhancedMediaGallerySortByActionGroup" stepKey="assertImagePositionAfterSortByNameZToA">
-            <argument name="firstImageFile" value="{{ImageUpload1.value}}"/>
-            <argument name="secondImageFile" value="{{ImageUpload_1.file}}"/>
+            <argument name="firstImageFile" value="{{ImageUpload3.value}}"/>
+            <argument name="secondImageFile" value="{{ImageUpload1.value}}"/>
             <argument name="thirdImageFile" value="{{ImageUpload.file}}"/>
         </actionGroup>
     </test>