Merge branch 'B2B-2113' of https://github.com/magento-arcticfoxes/magento2ce into af-prs-develop

Author: rganin

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

@@ -16,10 +16,12 @@
             <argument name="image" defaultValue="ProductImage"/>
         </arguments>
 
+        <waitForElementVisible selector="{{AdminProductImagesSection.productImagesToggle}}" stepKey="waitForImagesSection"/>
         <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductImagesSection"/>
-        <waitForPageLoad time="30" stepKey="waitForPageRefresh"/>
+        <waitForPageLoad stepKey="waitForPageRefresh"/>
         <waitForElementVisible selector="{{AdminProductImagesSection.imageUploadButton}}" stepKey="seeImageSectionIsReady"/>
         <attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="{{image.file}}" stepKey="uploadFile"/>
+        <waitForPageLoad stepKey="waitForImageUpload"/>
         <waitForElementNotVisible selector="{{AdminProductImagesSection.uploadProgressBar}}" stepKey="waitForUpload"/>
         <waitForElementVisible selector="{{AdminProductImagesSection.imageFile(image.fileName)}}" stepKey="waitForThumbnail"/>
     </actionGroup>

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

@@ -15,6 +15,7 @@
         <arguments>
             <argument name="image" defaultValue="{{MagentoLogo.filename}}" type="string"/>
         </arguments>
+        <waitForElementVisible selector="{{AdminProductImagesSection.productImagesToggle}}" stepKey="waitForProductImagesSection"/>
         <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductImagesSection"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForElementVisible selector="{{AdminProductImagesSection.imageFile(image)}}" stepKey="seeImage"/>

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

@@ -16,15 +16,20 @@
             <argument name="image" defaultValue="ProductImage"/>
             <argument name="altText" defaultValue="{{ProductImage.title}}" type="string"/>
         </arguments>
+        <waitForElementVisible selector="{{AdminProductImagesSection.productImagesToggle}}" stepKey="waitForImagesSection"/>
         <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageFile(image.fileName)}}" visible="false" stepKey="expandImages"/>
+        <waitForPageLoad stepKey="waitForImages"/>
         <waitForElementVisible selector="{{AdminProductImagesSection.imageFile(image.fileName)}}" stepKey="seeProductImageName"/>
         <click selector="{{AdminProductImagesSection.imageFile(image.fileName)}}" stepKey="clickProductImage"/>
+        <waitForPageLoad stepKey="waitForImageDetails"/>
         <waitForElementVisible selector="{{AdminProductImagesSection.altText}}" stepKey="seeAltTextSection"/>
         <grabValueFrom selector="{{AdminProductImagesSection.altText}}" stepKey="actualAltText"/>
         <assertEquals stepKey="assertAltText">
             <expectedResult type="string">{{altText}}</expectedResult>
             <actualResult type="variable">actualAltText</actualResult>
         </assertEquals>
         <click selector="{{AdminSlideOutDialogSection.closeButton}}" stepKey="clickCloseButton"/>
+        <waitForPageLoad stepKey="waitForClose"/>
+        <waitForElementNotVisible selector="{{AdminProductImagesSection.altText}}" stepKey="waitForDetailsGone"/>
     </actionGroup>
 </actionGroups>

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

@@ -16,11 +16,16 @@
             <argument name="image" defaultValue="ProductImage"/>
             <argument name="altText" defaultValue="{{ProductImage.title}}" type="string"/>
         </arguments>
+        <waitForElementVisible selector="{{AdminProductImagesSection.productImagesToggle}}" stepKey="waitForImagesSection"/>
         <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageFile(image.fileName)}}" visible="false" stepKey="expandImages"/>
+        <waitForPageLoad stepKey="waitForImages"/>
         <waitForElementVisible selector="{{AdminProductImagesSection.imageFile(image.fileName)}}" stepKey="seeProductImageName"/>
         <click selector="{{AdminProductImagesSection.imageFile(image.fileName)}}" stepKey="clickProductImage"/>
+        <waitForPageLoad stepKey="waitForImageDetails"/>
         <waitForElementVisible selector="{{AdminProductImagesSection.altText}}" stepKey="seeAltTextSection"/>
         <fillField selector="{{AdminProductImagesSection.altText}}" userInput="{{altText}}" stepKey="fillAltTextSection"/>
         <click selector="{{AdminSlideOutDialogSection.closeButton}}" stepKey="clickCloseButton"/>
+        <waitForPageLoad stepKey="waitForClose"/>
+        <waitForElementNotVisible selector="{{AdminProductImagesSection.altText}}" stepKey="waitForDetailsGone"/>
     </actionGroup>
 </actionGroups>