MC-38088: [MFTF] Flaky AdminSimpleProductRemoveImagesTest

Author: viktorpetryk

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenProductImagesSectionActionGroup.xml

@@ -12,8 +12,9 @@
         <annotations>
             <description>Requires the navigation to the Product page. Opens 'Image and Videos' section.</description>
         </annotations>
-        <scrollTo selector="{{AdminProductImagesSection.productImagesToggle}}" stepKey="scrollToProductImagesTab"/>
         <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductImagesSection"/>
+        <scrollTo selector="{{AdminProductImagesSection.productImagesToggle}}" stepKey="scrollToProductImagesSection"/>
+        <waitForPageLoad stepKey="waitForLoadingMediaContent"/>
         <waitForElementVisible selector="{{AdminProductImagesSection.imageUploadButton}}" stepKey="waitForImageUploadButton"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductRemoveImagesTest.xml

@@ -49,7 +49,6 @@
         <actionGroup ref="AdminOpenProductImagesSectionActionGroup" stepKey="expandImages"/>
 
         <!-- Upload and set Base image -->
-        <waitForPageLoad stepKey="waitBeforeAttachImages"/>
         <attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="adobe-base.jpg" stepKey="attach1"/>
         <waitForPageLoad stepKey="waitForUpload1"/>
         <click selector="{{AdminProductImagesSection.nthProductImage('1')}}" stepKey="openImageDetails1"/>
@@ -116,7 +115,7 @@
         <actionGroup ref="AdminOpenProductImagesSectionActionGroup" stepKey="expandImages2"/>
 
         <!-- Remove all images -->
-        <waitForPageLoad stepKey="waitBeforeRemoveImages"/>
+        <waitForElementVisible selector="{{AdminProductImagesSection.nthRemoveImageBtn('1')}}" stepKey="waitForRemoveImageButtonVisible"/>
         <click selector="{{AdminProductImagesSection.nthRemoveImageBtn('1')}}" stepKey="removeImage1"/>
         <click selector="{{AdminProductImagesSection.nthRemoveImageBtn('2')}}" stepKey="removeImage2"/>
         <click selector="{{AdminProductImagesSection.nthRemoveImageBtn('3')}}" stepKey="removeImage3"/>