B2B-2133: [AWS S3] Test Fails to Assert Success Message after adding to cart

 - Fixing flaky media gallery test actions

Author: dhaecker

app/code/Magento/Cms/Test/Mftf/ActionGroup/AttachImageActionGroup.xml

@@ -17,9 +17,10 @@
             <argument name="Image"/>
         </arguments>
 
+        <waitForElement selector="{{MediaGallerySection.BrowseUploadImage}}" stepKey="waitForUploadImage"/>
         <attachFile selector="{{MediaGallerySection.BrowseUploadImage}}" userInput="{{Image.value}}" stepKey="uploadImage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+        <waitForPageLoad stepKey="waitForLoadingMaskToDisappear"/>
         <waitForElementVisible  selector="{{MediaGallerySection.imageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="waitForUploadImage"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Cms/Test/Mftf/ActionGroup/SaveImageActionGroup.xml

@@ -13,8 +13,10 @@
             <description>Clicks on Insert File in the Media Gallery.</description>
         </annotations>
 
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <waitForElementVisible selector="{{MediaGallerySection.InsertFile}}" stepKey="waitForInsertBtn"/>
         <click selector="{{MediaGallerySection.InsertFile}}" stepKey="clickInsertBtn"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+        <waitForPageLoad stepKey="waitForLoadingMaskToDisappear"/>
     </actionGroup>
 </actionGroups>