Skip to content

Commit 1d9f73c

Browse files
ENGCOM-5303: Ensure page is loaded after order click actions #23280
- Merge Pull Request #23280 from fooman/magento2:fix-mftf-checkout-flaky-tests - Merged commits: 1. 32bdf86
2 parents 1677a1d + 32bdf86 commit 1d9f73c

File tree

8 files changed

+14
-0
lines changed

8 files changed

+14
-0
lines changed

app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsChart.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@
8383
<!-- Create invoice -->
8484
<comment userInput="Create invoice" stepKey="createInvoice"/>
8585
<click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
86+
<waitForPageLoad stepKey="waitForOrderPageToLoad"/>
8687
<click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
88+
<waitForPageLoad stepKey="waitForInvoicePageToLoad"/>
8789
<see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoiceInPageTitle" after="clickInvoiceButton"/>
8890
<see selector="{{AdminInvoiceTotalSection.total('Subtotal')}}" userInput="$150.00" stepKey="seeCorrectGrandTotal"/>
8991
<click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102
<click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
103103
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
104104
<click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
105+
<waitForPageLoad stepKey="waitForOrderPageToLoad"/>
105106

106107
<!-- Checking the correctness of displayed custom options for user parameters on Order -->
107108

app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,11 @@
122122
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
123123

124124
<click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
125+
<waitForPageLoad stepKey="waitForOrderPageToLoad"/>
125126
<click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoice"/>
127+
<waitForPageLoad stepKey="waitForNewInvoicePageToLoad"/>
126128
<click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
129+
<waitForPageLoad stepKey="waitForNewInvoiceToBeCreated"/>
127130
<see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
128131
<click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShip"/>
129132
<waitForLoadingMaskToDisappear stepKey="waitForShipLoadingMask"/>

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
<click stepKey="s81" selector="{{AdminOrdersGridSection.submitSearch22}}" />
7373
<waitForPageLoad stepKey="s831"/>
7474
<click stepKey="s84" selector="{{AdminOrdersGridSection.firstRow}}" />
75+
<waitForPageLoad stepKey="waitForOrderToLoad"/>
7576
<see stepKey="s85" selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" />
7677
<see stepKey="s87" selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="Customer" />
7778
<see stepKey="s89" selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="$$simpleuscustomer.email$$" />

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
<click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
6363
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
6464
<click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
65+
<waitForPageLoad stepKey="waitForOrderPageToLoad"/>
6566
<see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeAdminOrderStatus"/>
6667
<see selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="{{CustomerEntityOne.fullname}}" stepKey="seeAdminOrderGuest"/>
6768
<see selector="{{AdminOrderDetailsInformationSection.accountInformation}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeAdminOrderEmail"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
</actionGroup>
7272

7373
<click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
74+
<waitForPageLoad stepKey="waitForOrderPageToLoad"/>
7475
<click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
7576
<waitForPageLoad stepKey="waitForNewInvoicePageLoad"/>
7677
<fillField selector="{{AdminInvoiceItemsSection.qtyToInvoiceColumn}}" userInput="1" stepKey="ChangeQtyToInvoice"/>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,11 @@
6969
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
7070

7171
<click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
72+
<waitForPageLoad stepKey="waitForOrderPageToLoad"/>
7273
<click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoice"/>
74+
<waitForPageLoad stepKey="waitForNewInvoicePageToLoad"/>
7375
<click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
76+
<waitForPageLoad stepKey="waitForInvoiceToBeCreated"/>
7477
<see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
7578
<click selector="{{AdminOrderDetailsOrderViewSection.invoices}}" stepKey="clickInvoices"/>
7679
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask5" />

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,9 @@
104104

105105
<!-- Create invoice -->
106106
<click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
107+
<waitForPageLoad stepKey="waitForOrderPageToLoad"/>
107108
<click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
109+
<waitForPageLoad stepKey="waitForNewInvoicePageToLoad"/>
108110
<see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoiceInPageTitle" after="clickInvoiceButton"/>
109111

110112
<!-- Verify Invoice Totals including subTotal Shipping Discount and GrandTotal -->

0 commit comments

Comments
 (0)