ACP2E-1673: fix failing MC-26654 due to MC-26545; adjust AC-7106

Author: alzota

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

@@ -22,6 +22,10 @@
             <!-- Login as admin -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
 
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="openProductIndexPageBefore"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetGridBefore"/>
+            <actionGroup ref="AdminResetColumnDropDownActionGroup" stepKey="ResetColumnDropdownBefore"/>
+
             <!--Create Category-->
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
 
@@ -34,6 +38,10 @@
                 <argument name="ProductAttribute" value="newProductAttribute"/>
             </actionGroup>
 
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="openProductIndexPageAfter"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetGridAfter"/>
+            <actionGroup ref="AdminResetColumnDropDownActionGroup" stepKey="ResetColumnDropdownAfter"/>
+
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
@@ -98,9 +106,6 @@
         <!--Click on Go Back button -->
         <click selector="{{AdminProductFormActionSection.backButton}}" stepKey="clickBackToGridSimple"/>
 
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetGrid1"/>
-        <actionGroup ref="AdminResetColumnDropDownActionGroup" stepKey="ResetColumnDropdown1"/>
-
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchProductOnProductGridPage">
             <argument name="product" value="SimpleProduct"/>
         </actionGroup>
@@ -120,9 +125,6 @@
             <argument name="value" value="value 1 admin"/>
         </actionGroup>
 
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetGrid2"/>
-        <actionGroup ref="AdminResetColumnDropDownActionGroup" stepKey="ResetColumnDropdown2"/>
-
         <!--Verify Product Attribute is present in Category Store Front Page -->
         <amOnPage url="$$createCategory.custom_attributes[url_key]$$.html" stepKey="goToStorefrontPage"/>
         <waitForPageLoad stepKey="waitForProductFrontPageToLoad"/>

app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrdersAndCheckGridsTest.xml

@@ -96,8 +96,6 @@
             <requiredEntity createDataKey="createGuestCartThree"/>
         </updateData>
 
-        <wait time="60" stepKey="wait1" />
-
         <magentoCron groups="default" stepKey="runCronFive"/>
 
         <createData entity="CreditMemo" stepKey="refundOrderOne">
@@ -136,20 +134,13 @@
 
         <magentoCron groups="default" stepKey="runCronNine"/>
 
-        <wait time="60" stepKey="wait2" />
-
         <magentoCron groups="default" stepKey="runCronTen"/>
 
         <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
 
         <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrderPage"/>
-        <waitForPageLoad time="30" stepKey="waitForGrid"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
 
-        <comment userInput="Comment is added to preserve the step key for backward compatibility"  stepKey="getOrderOneId"/>
-        <comment userInput="Comment is added to preserve the step key for backward compatibility"  stepKey="getOrderTwoId"/>
-        <comment userInput="Comment is added to preserve the step key for backward compatibility"  stepKey="getOrderThreeId"/>
-
         <actionGroup ref="AdminOpenOrderByEntityIdActionGroup" stepKey="openOrderOne">
             <argument name="entityId" value="$createGuestCartOne.return$"/>
         </actionGroup>
@@ -206,24 +197,18 @@
             <argument name="orderId" value="{$grabOrderIdOne}"/>
         </actionGroup>
 
-        <waitForPageLoad time="30" stepKey="waitForGridOne"/>
-
         <see selector="{{AdminDataGridTableSection.gridCell('1', 'Status')}}" userInput="Closed" stepKey="seeOrderClosedInGridOne"/>
 
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridByIdTwo">
             <argument name="orderId" value="{$grabOrderIdTwo}"/>
         </actionGroup>
 
-        <waitForPageLoad time="30" stepKey="waitForGridTwo"/>
-
         <see selector="{{AdminDataGridTableSection.gridCell('1', 'Status')}}" userInput="Closed" stepKey="seeOrderClosedInGridTwo"/>
 
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridByIdThree">
             <argument name="orderId" value="{$grabOrderIdThree}"/>
         </actionGroup>
 
-        <waitForPageLoad time="30" stepKey="waitForGridThree"/>
-
         <see selector="{{AdminDataGridTableSection.gridCell('1', 'Status')}}" userInput="Closed" stepKey="seeOrderClosedInGridThree"/>
     </test>
 </tests>