Skip to content

Commit f7dd7f1

Browse files
ENGCOM-7764: [MFTF] use action group for go to orders grid page #28925
- Merge Pull Request #28925 from Usik2203/magento2:mftf-go-to-orders-grid-page - Merged commits: 1. b7b2bfe 2. a86e1da 3. 2f64397
2 parents 0516c8b + 2f64397 commit f7dd7f1

File tree

39 files changed

+61
-83
lines changed

39 files changed

+61
-83
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@
9393
<see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessInvoiceMessage"/>
9494
<!--Create Shipment for the order-->
9595
<comment userInput="Create Shipment for the order" stepKey="createShipmentForOrder"/>
96-
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage2"/>
97-
<waitForPageLoad time="30" stepKey="waitForOrderListPageLoading"/>
96+
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrdersPage2"/>
9897
<actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="openOrderPageForShip"/>
9998
<click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
10099
<waitForPageLoad stepKey="waitForShipmentPagePage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@
8585
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
8686

8787
<!-- Open created order in backend -->
88-
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
89-
<waitForPageLoad stepKey="waitForOrdersPageLoad"/>
88+
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
9089
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
9190
<argument name="orderId" value="$grabOrderNumber"/>
9291
</actionGroup>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,7 @@
9898
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
9999

100100
<!-- Open created order in backend -->
101-
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
102-
<waitForPageLoad stepKey="waitForOrdersPageLoad"/>
101+
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
103102
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
104103
<argument name="orderId" value="$grabOrderNumber"/>
105104
</actionGroup>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@
8686
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
8787

8888
<!-- Open created order in backend -->
89-
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
90-
<waitForPageLoad stepKey="waitForOrdersPageLoad"/>
89+
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
9190
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
9291
<argument name="orderId" value="$grabOrderNumber"/>
9392
</actionGroup>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@
7979
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
8080

8181
<!-- Open created order in backend -->
82-
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
83-
<waitForPageLoad stepKey="waitForOrdersPageLoad"/>
82+
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
8483
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
8584
<argument name="orderId" value="$grabOrderNumber"/>
8685
</actionGroup>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,7 @@
198198
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
199199

200200
<!-- Open created order -->
201-
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
202-
<waitForPageLoad stepKey="waitForOrderPageLoad"/>
201+
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
203202
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
204203
<argument name="orderId" value="$grabOrderNumber"/>
205204
</actionGroup>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@
108108
<see selector="{{StorefrontCustomerAddressesSection.shippingAddress}}" userInput="T: {{updateCustomerUKAddress.telephone}}" stepKey="seeTelephoneInShippingAddress"/>
109109

110110
<!--Open Order Index Page -->
111-
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
112-
<waitForPageLoad stepKey="waitForOrderIndexPageToLoad"/>
111+
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
113112

114113
<!-- Filter Order using orderId and assert order-->
115114
<actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@
7777
<actionGroup ref="StorefrontRegisterCustomerAfterCheckoutActionGroup" stepKey="registerCustomer"/>
7878

7979
<!-- Open Order Index Page -->
80-
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
81-
<waitForPageLoad stepKey="waitForPageLoad5"/>
80+
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
8281

8382
<!-- Filter Order using orderId and assert order-->
8483
<actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,7 @@
150150
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="orderId"/>
151151

152152
<!-- Open Order Index Page -->
153-
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
154-
<waitForPageLoad stepKey="waitForPageLoad5"/>
153+
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
155154

156155
<!-- Filter Order using orderId and assert order-->
157156
<actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@
7777
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="orderId"/>
7878

7979
<!-- Open Order Index Page -->
80-
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
81-
<waitForPageLoad stepKey="waitForPageLoad"/>
80+
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
8281

8382
<!-- Filter Order using orderId and assert order-->
8483
<actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">

0 commit comments

Comments
 (0)