Merge remote-tracking branch 'mainline/2.4-develop' into PWA-1938-gql-auth-fix

Author: pdohogne-magento

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;
     }

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>

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>