Added wait action in the end of AdminOrdersGridClearFiltersActionGroup

elevinskii · elevinskii · commit d63b5d8ebf71 · 2020-04-11T14:13:21.000+03:00
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsChart.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsChart.xml
@@ -34,7 +34,6 @@
             <!-- Reset admin order filter -->
             <comment userInput="Reset admin order filter" stepKey="resetAdminOrderFilter"/>
             <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingOrderGrid"/>
             <magentoCLI command="config:set admin/dashboard/enable_charts 0" stepKey="setDisableChartsAsDefault"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml b/app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml
@@ -115,11 +115,8 @@
         <actionGroup ref="StorefrontSignOutActionGroup" stepKey="StorefrontSignOutActionGroup"/>
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
 
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
         <!-- Reset admin order filter -->
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask5"/>
         <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum"/>
         <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest/CheckCheckoutSuccessPageAsGuestTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest/CheckCheckoutSuccessPageAsGuestTest.xml
@@ -26,7 +26,6 @@
             <!--Cancel orders-->
             <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
             <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="goToOrdersPage"/>
-            <waitForLoadingMaskToDisappear stepKey="waitAfterClearFilters"/>
             <actionGroup ref="AdminGridColumnShowActionGroup" stepKey="showCustomerEmailColumn">
                 <argument name="columnLabel" value="Customer Email"/>
             </actionGroup>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest/CheckCheckoutSuccessPageAsRegisterCustomerTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest/CheckCheckoutSuccessPageAsRegisterCustomerTest.xml
@@ -29,7 +29,6 @@
             <!--Cancel orders-->
             <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
             <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="goToOrdersPage"/>
-            <waitForLoadingMaskToDisappear stepKey="waitAfterClearFilters"/>
             <actionGroup ref="AdminGridColumnShowActionGroup" stepKey="showCustomerEmailColumn">
                 <argument name="columnLabel" value="Customer Email"/>
             </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrdersGridClearFiltersActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrdersGridClearFiltersActionGroup.xml
@@ -16,5 +16,6 @@
         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToGridOrdersPage"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
         <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.enabledFilters}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
+        <waitForLoadingMaskToDisappear stepKey="waitAfterClearFilters"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml
@@ -63,10 +63,7 @@
         <actionGroup ref="AdminCreateInvoiceAndCreditMemoActionGroup" stepKey="createCreditMemo"/>
 
         <!-- Navigate to backend: Go to Sales > Orders -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrderPage"/>
-        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
 
         <!-- Select Mass Action according to dataset: Cancel -->
         <actionGroup ref="AdminTwoOrderActionOnGridActionGroup" stepKey="massActionCancel">
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml
@@ -63,10 +63,7 @@
         <actionGroup ref="AdminCreateInvoiceAndCreditMemoActionGroup" stepKey="createCreditMemo"/>
 
         <!-- Navigate to backend: Go to Sales > Orders -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrderPage"/>
-        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
 
         <!-- Select Mass Action according to dataset: Cancel -->
         <actionGroup ref="AdminTwoOrderActionOnGridActionGroup" stepKey="massActionCancel">
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml
@@ -50,10 +50,7 @@
         <actionGroup ref="AdminCreateInvoiceAndShipmentActionGroup" stepKey="createShipment"/>
 
         <!-- Navigate to backend: Go to Sales > Orders -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrderPage"/>
-        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
 
         <!-- Select Mass Action according to dataset: Hold -->
         <actionGroup ref="AdminOrderActionOnGridActionGroup" stepKey="actionHold">
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml
@@ -60,10 +60,7 @@
         <actionGroup ref="AdminCreateInvoiceActionGroup" stepKey="createInvoice"/>
 
         <!-- Navigate to backend: Go to Sales > Orders -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrderPage"/>
-        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
 
         <!-- Select Mass Action according to dataset: Hold -->
         <actionGroup ref="AdminTwoOrderActionOnGridActionGroup" stepKey="massActionHold">
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml
@@ -47,10 +47,7 @@
         </assertNotEmpty>
 
         <!-- Navigate to backend: Go to Sales > Orders -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrderPage"/>
-        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
 
         <!-- Select Mass Action according to dataset: Unhold -->
         <actionGroup ref="AdminOrderActionOnGridActionGroup" stepKey="actionUnhold">
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml
@@ -46,10 +46,7 @@
         </assertNotEmpty>
 
         <!-- Navigate to backend: Go to Sales > Orders -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrderPage"/>
-        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
 
         <!-- Select Mass Action according to dataset: Cancel -->
         <actionGroup ref="AdminOrderActionOnGridActionGroup" stepKey="ActionCancel">
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml
@@ -52,10 +52,7 @@
         <see userInput="You put the order on hold." stepKey="seeHoldMessage"/>
 
         <!-- Navigate to backend: Go to Sales > Orders -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrderPage"/>
-        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
 
         <!-- Select Mass Action according to dataset: Unhold -->
         <actionGroup ref="AdminOrderActionOnGridActionGroup" stepKey="actionUnold">
