Stablethon:ACQE-5331 test bug fix

Author: Manoranjan.Prakash

app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml

@@ -45,5 +45,7 @@
         <element name="productAttributeOptionValue" type="button" selector="//div[@id='narrow-by-list']//a[contains(text(), '{{var1}}')]" parameterized="true"/>
         <element name="outOfStockProductCategoryPage" type="text" selector="//div[@class='stock unavailable']//span[text()='Out of stock']"/>
         <element name="ListedProductAttributes" type="block" selector="//div[@aria-label='{{vs_attribute}}']//div[@aria-label='{{attribute_name}}']" parameterized="true"/>
+        <element name="uploadedImageLarge" type="text" selector=".products-grid img[src*='/large']"/>
+        <element name="uploadedImageSmallLarge" type="text" selector=".products-grid img[src*='placeholder/small_image.jpg']"/>
     </section>
 </sections>

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

@@ -119,7 +119,8 @@
 
         <!-- Go to the category page and see a placeholder image for the second product -->
         <amOnPage url="$$category.custom_attributes[url_key]$$.html" stepKey="goToCategoryPage"/>
-        <seeElement selector=".products-grid img[src*='placeholder/small_image.jpg']" stepKey="seePlaceholder"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.uploadedImageSmallLarge}}" stepKey="waitForPlaceholder"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.uploadedImageSmallLarge}}" stepKey="seePlaceHolder"/>
 
         <!-- Go to the second product edit page -->
         <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndex2"/>
@@ -153,12 +154,14 @@
         <seeElement selector="img.admin__control-thumbnail[src*='/large']" stepKey="seeImgInGrid"/>
 
         <!-- Go to the category page and see the uploaded image -->
-        <amOnPage url="$$category.custom_attributes[url_key]$$.html" stepKey="goToCategoryPage2"/>
-        <seeElement selector=".products-grid img[src*='/large']" stepKey="seeUploadedImg"/>
+        <amOnPage url="$$category.custom_attributes[url_key]$$.html" stepKey="goToStorefrontCategoryPage"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.uploadedImageLarge}}" stepKey="waitForUploadedImgOnStorefrontCategoryPage"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.uploadedImageLarge}}" stepKey="seeUploadedImgOnStorefrontCategoryPage"/>
 
         <!-- Go to the product page and see the uploaded image -->
-        <amOnPage url="$$secondProduct.custom_attributes[url_key]$$.html" stepKey="goToStorefront2"/>
-        <waitForPageLoad stepKey="waitForStorefront2"/>
-        <seeElementInDOM selector="{{StorefrontProductMediaSection.imageFile('large')}}" stepKey="seeLarge2"/>
+        <amOnPage url="$$secondProduct.custom_attributes[url_key]$$.html" stepKey="goToStorefrontProductPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontProductPageToLoad"/>
+        <waitForElementVisible selector="{{StorefrontProductMediaSection.imageFile('large')}}" stepKey="waitForLarge2ImageOnStorefrontProductPage"/>
+        <seeElementInDOM selector="{{StorefrontProductMediaSection.imageFile('large')}}" stepKey="seeLarge2ImageOnStorefrontProductPage"/>
     </test>
 </tests>