MC-38088: [MFTF] Flaky AdminSimpleProductRemoveImagesTest

Author: viktorpetryk

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

@@ -11,11 +11,11 @@
         <annotations>
             <features value="Catalog"/>
             <stories value="Add/remove images and videos for all product types and category"/>
-            <title value="Admin should be able to remove Product Images assigned as Base, Small and Thumbnail from Simple Product"/>
+            <title value="Remove Product Images assigned as Base, Small and Thumbnail from Simple Product"/>
             <description value="Admin should be able to remove Product Images assigned as Base, Small and Thumbnail from Simple Product"/>
-            <severity value="BLOCKER"/>
-            <testCaseId value="MC-191"/>
-            <group value="Catalog"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-25383"/>
+            <group value="catalog"/>
         </annotations>
 
         <before>
@@ -29,23 +29,25 @@
         <after>
             <deleteData createDataKey="category" stepKey="deletePreReqCategory"/>
             <deleteData createDataKey="product" stepKey="deleteProduct"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductsPage"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
 
         <!-- Go to the product edit page -->
         <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndex"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGrid"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridBySku">
-            <argument name="product" value="$$product$$"/>
+            <argument name="product" value="$product$"/>
         </actionGroup>
-        <actionGroup ref="OpenProductForEditByClickingRowXColumnYInProductGridActionGroup" stepKey="openProduct"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="openProduct"/>
 
         <!-- Set url key -->
-        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
-        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="$$product.name$$" stepKey="fillUrlKey"/>
+        <comment userInput="BIC workaround" stepKey="openSeoSection"/>
+        <comment userInput="BIC workaround" stepKey="fillUrlKey"/>
 
         <!-- Expand images section -->
-        <click selector="{{AdminProductImagesSection.productImagesToggle}}" stepKey="expandImages"/>
+        <actionGroup ref="AdminOpenProductImagesSectionActionGroup" stepKey="expandImages"/>
 
         <!-- Upload and set Base image -->
         <attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="adobe-base.jpg" stepKey="attach1"/>
@@ -87,31 +89,31 @@
         <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct"/>
 
         <!-- Go to the product page and see the Base image -->
-        <amOnPage url="$$product.name$$.html" stepKey="goToProductPage"/>
+        <amOnPage url="{{StorefrontProductPage.url($product.custom_attributes[url_key]$)}}" stepKey="goToProductPage"/>
         <waitForPageLoad stepKey="wait4"/>
         <seeElement selector="{{StorefrontProductMediaSection.imageFile('/adobe-base')}}" stepKey="seeBase"/>
 
         <!-- Go to the category page and see the Small image -->
-        <amOnPage url="$$category.name$$.html" stepKey="goToCategoryPage"/>
+        <amOnPage url="{{StorefrontCategoryPage.url($category.custom_attributes[url_key]$)}}" stepKey="goToCategoryPage"/>
         <waitForPageLoad stepKey="wait3"/>
         <seeElement selector="{{StorefrontCategoryProductSection.ProductImageBySrc('/adobe-small')}}" stepKey="seeThumb"/>
 
         <!-- Go to the admin grid and see the Thumbnail image -->
         <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndex2"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGrid2"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridBySku2">
-            <argument name="product" value="$$product$$"/>
+            <argument name="product" value="$product$"/>
         </actionGroup>
         <seeElement selector="{{AdminProductGridSection.productThumbnailBySrc('/adobe-thumb')}}" stepKey="seeBaseInGrid"/>
 
         <!-- Go to the product edit page again -->
         <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndex3"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGrid3"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridBySku3">
-            <argument name="product" value="$$product$$"/>
+            <argument name="product" value="$product$"/>
         </actionGroup>
-        <actionGroup ref="OpenProductForEditByClickingRowXColumnYInProductGridActionGroup" stepKey="openProduct3"/>
-        <click selector="{{AdminProductImagesSection.productImagesToggle}}" stepKey="expandImages2"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="openProduct3"/>
+        <actionGroup ref="AdminOpenProductImagesSectionActionGroup" stepKey="expandImages2"/>
 
         <!-- Remove all images -->
         <click selector="{{AdminProductImagesSection.nthRemoveImageBtn('1')}}" stepKey="removeImage1"/>
@@ -123,19 +125,19 @@
         <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndex4"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGrid4"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridBySku4">
-            <argument name="product" value="$$product$$"/>
+            <argument name="product" value="$product$"/>
         </actionGroup>
         <dontSeeElement selector="{{AdminProductGridSection.productThumbnailBySrc('/adobe-thumb')}}" stepKey="dontSeeBaseInGrid"/>
         <seeElement selector="{{AdminProductGridSection.productThumbnailBySrc('/placeholder/thumbnail')}}" stepKey="seePlaceholderThumb"/>
 
         <!-- Check category page for placeholder -->
-        <amOnPage url="$$category.name$$.html" stepKey="goToCategoryPage2"/>
+        <amOnPage url="{{StorefrontCategoryPage.url($category.custom_attributes[url_key]$)}}" stepKey="goToCategoryPage2"/>
         <waitForPageLoad stepKey="wait7"/>
         <dontSeeElement selector="{{StorefrontCategoryProductSection.ProductImageBySrc('/adobe-small')}}" stepKey="dontSeeThumb"/>
         <seeElement selector="{{StorefrontCategoryProductSection.ProductImageBySrc('placeholder/small_image')}}" stepKey="seePlaceholderSmall"/>
 
         <!-- Check product page for placeholder -->
-        <amOnPage url="$$product.name$$.html" stepKey="goToProductPage2"/>
+        <amOnPage url="{{StorefrontProductPage.url($product.custom_attributes[url_key]$)}}" stepKey="goToProductPage2"/>
         <waitForPageLoad stepKey="wait8"/>
         <dontSeeElement selector="{{StorefrontProductMediaSection.imageFile('/adobe-base')}}" stepKey="dontSeeBase"/>
         <seeElement selector="{{StorefrontProductMediaSection.imageFile('placeholder/image')}}" stepKey="seePlaceholderBase"/>