MC-20071: Fix Skipped MFTF Tests From MC-17140: MAGETWO-98211, MC-56, MC-88

Author: zakdma

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

@@ -36,7 +36,7 @@
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="AdminDeleteStoreViewActionGroup"/>
             <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
-            <actionGroup ref="logout" stepKey="logout"/>
+            <actionGroup ref="logout" stepKey="amOnLogoutPage"/>
         </after>
 
         <!-- Search and select products -->
@@ -63,8 +63,8 @@
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpdateSuccessMsg"/>
 
         <!-- Run cron twice -->
-        <magentoCLI command="cron:run" arguments="--group=consumers" stepKey="cronSchedule"/>
-        <magentoCLI command="cron:run" arguments="--group=consumers" stepKey="cronRun"/>
+        <magentoCLI command="cron:run" arguments="--group=consumers" stepKey="runCron1"/>
+        <magentoCLI command="cron:run" arguments="--group=consumers" stepKey="runCron2"/>
         <magentoCLI command="indexer:reindex" stepKey="reindex"/>
 
         <!-- Assert on storefront default view -->

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml

@@ -21,23 +21,23 @@
 
         <before>
             <createData entity="ApiCategory" stepKey="createCategory"/>
-            <createData entity="ApiConfigurableProduct" stepKey="createFirstProduct">
+            <createData entity="ApiConfigurableProduct" stepKey="createProduct1">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-            <createData entity="ApiConfigurableProduct" stepKey="createSecondProduct">
+            <createData entity="ApiConfigurableProduct" stepKey="createProduct2">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-            <createData entity="ApiConfigurableProduct" stepKey="createThirdProduct">
+            <createData entity="ApiConfigurableProduct" stepKey="createProduct3">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
             <actionGroup ref="LoginAsAdmin" stepKey="login"/>
         </before>
 
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <deleteData createDataKey="createFirstProduct" stepKey="deleteFirstProduct"/>
-            <deleteData createDataKey="createSecondProduct" stepKey="deleteSecondProduct"/>
-            <deleteData createDataKey="createThirdProduct" stepKey="deleteThirdProduct"/>
+            <deleteData createDataKey="createProduct1" stepKey="deleteFirstProduct"/>
+            <deleteData createDataKey="createProduct2" stepKey="deleteSecondProduct"/>
+            <deleteData createDataKey="createProduct3" stepKey="deleteThirdProduct"/>
             <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
             <waitForPageLoad stepKey="waitForPageLoad"/>
             <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductsGridFilters"/>
@@ -46,7 +46,7 @@
 
         <!-- Search for prefix of the 3 products we created via api -->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <waitForPageLoad stepKey="wait1"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clearAll"/>
         <actionGroup ref="searchProductGridByKeyword" stepKey="searchForProduct">
             <argument name="keyword" value="ApiConfigurableProduct.name"/>
@@ -57,28 +57,28 @@
         <click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllProductInFilteredGrid"/>
         <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
         <click selector="{{AdminProductGridSection.bulkActionOption('Update attributes')}}" stepKey="clickBulkUpdate"/>
-        <waitForPageLoad stepKey="waitForUpdateAttributesPageLoad"/>
+        <waitForPageLoad stepKey="wait2"/>
 
         <!-- Update the description -->
         <click selector="{{AdminUpdateAttributesSection.toggleDescription}}" stepKey="clickToggleDescription"/>
         <fillField selector="{{AdminUpdateAttributesSection.description}}" userInput="MFTF automation!" stepKey="fillDescription"/>
-        <click selector="{{AdminEditProductAttributesSection.Save}}" stepKey="save"/>
-        <waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
+        <click selector="{{AdminEditProductAttributesSection.Save}}" stepKey="clickSave"/>
+        <waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" time="60" stepKey="waitForSuccessMessage"/>
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpdateSuccessMsg"/>
 
         <!-- Run cron twice -->
-        <magentoCLI command="cron:run" arguments="--group=consumers" stepKey="cronSchedule"/>
-        <magentoCLI command="cron:run" arguments="--group=consumers" stepKey="cronRun"/>
+        <magentoCLI command="cron:run" arguments="--group=consumers" stepKey="runCron1"/>
+        <magentoCLI command="cron:run" arguments="--group=consumers" stepKey="runCron2"/>
         <magentoCLI command="indexer:reindex" stepKey="reindex"/>
 
         <!-- Check storefront for description -->
-        <amOnPage url="{{StorefrontProductPage.url($$createFirstProduct.custom_attributes[url_key]$$)}}" stepKey="goToFirstProductPageOnStorefront"/>
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct1.custom_attributes[url_key]$$)}}" stepKey="goToFirstProductPageOnStorefront"/>
         <waitForPageLoad stepKey="waitForFirstProductPageLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productDescription}}" userInput="MFTF automation!" stepKey="seeFirstDescription"/>
-        <amOnPage url="{{StorefrontProductPage.url($$createSecondProduct.custom_attributes[url_key]$$)}}" stepKey="goToSecondProductPageOnStorefront"/>
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct2.custom_attributes[url_key]$$)}}" stepKey="goToSecondProductPageOnStorefront"/>
         <waitForPageLoad stepKey="waitForSecondProductPageLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productDescription}}" userInput="MFTF automation!" stepKey="seeSecondDescription"/>
-        <amOnPage url="{{StorefrontProductPage.url($$createThirdProduct.custom_attributes[url_key]$$)}}" stepKey="goToThirdProductPageOnStorefront"/>
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct3.custom_attributes[url_key]$$)}}" stepKey="goToThirdProductPageOnStorefront"/>
         <waitForPageLoad stepKey="waitForThirdProductPageLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productDescription}}" userInput="MFTF automation!" stepKey="seeThirdDescription"/>
     </test>