Skip to content

Commit b0bea10

Browse files
sidolovsidolov
authored
ENGCOM-9279: [MTTF] Excessive order grid filtering actions removing #34128 
2 parents 177254d + 41ba7c4 commit b0bea10

11 files changed

+85
-47
lines changed

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,18 @@
8181
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrderButton"/>
8282
<seeElement selector="{{CheckoutSuccessMainSection.success}}" stepKey="orderIsSuccessfullyPlaced"/>
8383
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
84+
<actionGroup ref="StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup" stepKey="openOrderViewPage"/>
85+
<grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
8486

8587
<!-- Login as admin -->
8688
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
8789

88-
<!-- Open created order in backend -->
89-
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
90-
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
91-
<argument name="orderId" value="$grabOrderNumber"/>
90+
<actionGroup ref="AdminOpenOrderByEntityIdActionGroup" stepKey="filterOrdersGridById">
91+
<argument name="entityId" value="$grabOrderId"/>
9292
</actionGroup>
93-
93+
<comment userInput="Comment is added to preserve Backward Compatibility" stepKey="goToOrders"/>
94+
<comment userInput="Comment is added to preserve Backward Compatibility" stepKey="filterOrderGridById"/>
95+
9496
<!-- Assert order total -->
9597
<scrollTo selector="{{AdminOrderTotalSection.grandTotal}}" stepKey="scrollToOrderTotalSection"/>
9698
<see selector="{{AdminOrderTotalSection.grandTotal}}" userInput="$565.00" stepKey="checkOrderTotalInBackend"/>

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,20 @@
9090
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForCheckoutPaymentSectionPageLoad"/>
9191
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="orderIsSuccessfullyPlaced"/>
9292
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
93+
<actionGroup ref="StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup" stepKey="openOrderViewPage"/>
94+
<grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
9395

9496
<!-- Login as admin -->
9597
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
98+
99+
<!--Step11. Go to admin Order page for newly created order-->
100+
<actionGroup ref="AdminOpenOrderByEntityIdActionGroup" stepKey="openAdminOrderViewPage">
101+
<argument name="entityId" value="$grabOrderId"/>
102+
</actionGroup>
96103

97104
<!-- Open created order in backend -->
98-
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
99-
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
100-
<argument name="orderId" value="$grabOrderNumber"/>
101-
</actionGroup>
105+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="goToOrders"/>
106+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterOrderGridById"/>
102107

103108
<!-- Assert order total -->
104109
<scrollTo selector="{{AdminOrderTotalSection.grandTotal}}" stepKey="scrollToOrderTotalSection"/>

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,16 @@
8383
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForCheckoutPaymentSectionPageLoad"/>
8484
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="orderIsSuccessfullyPlaced"/>
8585
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
86+
<actionGroup ref="StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup" stepKey="openOrderViewPage"/>
87+
<grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
8688

8789
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
8890

89-
<!-- Open created order in backend -->
90-
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
91-
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
92-
<argument name="orderId" value="$grabOrderNumber"/>
91+
<actionGroup ref="AdminOpenOrderByEntityIdActionGroup" stepKey="filterOrdersGridById">
92+
<argument name="entityId" value="$grabOrderId"/>
9393
</actionGroup>
94+
<comment userInput="Comment is added to preserve Backward Compatibility" stepKey="goToOrders"/>
95+
<comment userInput="Comment is added to preserve Backward Compatibility" stepKey="filterOrderGridById"/>
9496

9597
<!-- Assert order total -->
9698
<scrollTo selector="{{AdminOrderTotalSection.grandTotal}}" stepKey="scrollToOrderTotalSection"/>

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,19 @@
7575
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrderButton"/>
7676
<seeElement selector="{{CheckoutSuccessMainSection.success}}" stepKey="orderIsSuccessfullyPlaced"/>
7777
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
78+
<actionGroup ref="StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup" stepKey="openOrderViewPage"/>
79+
<grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
7880

7981
<!-- Login as admin -->
8082
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
8183

8284
<!-- Open created order in backend -->
83-
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
84-
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
85-
<argument name="orderId" value="$grabOrderNumber"/>
85+
<actionGroup ref="AdminOpenOrderByEntityIdActionGroup" stepKey="openAdminOrderViewPage">
86+
<argument name="entityId" value="$grabOrderId"/>
8687
</actionGroup>
8788

89+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="goToOrders"/>
90+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterOrderGridById"/>
8891
<!-- Assert that shipping and billing address are the same -->
8992
<grabTextFrom selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" stepKey="shippingAddress"/>
9093
<grabTextFrom selector="{{AdminShipmentAddressInformationSection.billingAddress}}" stepKey="billingAddress"/>

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,16 +195,19 @@
195195
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrderButton"/>
196196
<seeElement selector="{{CheckoutSuccessMainSection.success}}" stepKey="orderIsSuccessfullyPlaced" />
197197
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
198+
<actionGroup ref="StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup" stepKey="openOrderViewPage"/>
199+
<grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
198200

199201
<!-- Login as admin -->
200202
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
201203

202204
<!-- Open created order -->
203-
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
204-
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
205-
<argument name="orderId" value="$grabOrderNumber"/>
205+
<actionGroup ref="AdminOpenOrderByEntityIdActionGroup" stepKey="openAdminOrderViewPage">
206+
<argument name="entityId" value="$grabOrderId"/>
206207
</actionGroup>
207208

209+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="goToOrders"/>
210+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterOrderGridById"/>
208211
<!-- Assert that addresses on order page the same -->
209212
<grabTextFrom selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" stepKey="shippingAddressOrderPage"/>
210213
<grabTextFrom selector="{{AdminShipmentAddressInformationSection.billingAddress}}" stepKey="billingAddressOrderPage"/>

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,16 @@
7676
<!-- Place order and Assert success message -->
7777
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
7878
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="orderId"/>
79+
<actionGroup ref="StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup" stepKey="openOrderViewPage"/>
80+
<grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
7981

80-
<!-- Open Order Index Page -->
81-
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
82-
83-
<!-- Filter Order using orderId and assert order-->
84-
<actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
85-
<argument name="orderId" value="$orderId"/>
82+
<actionGroup ref="AdminOpenOrderByEntityIdActionGroup" stepKey="openAdminOrderViewPage">
83+
<argument name="entityId" value="$grabOrderId"/>
8684
</actionGroup>
87-
88-
<click selector="{{AdminOrdersGridSection.viewLink('$orderId')}}" stepKey="clickOnViewLink"/>
89-
<waitForPageLoad stepKey="waitForOrderPageToLoad"/>
85+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="goToOrders"/>
86+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterOrderGridById"/>
87+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickOnViewLink"/>
88+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForOrderPageToLoad"/>
9089

9190
<!-- Ship the order and assert the shipping status -->
9291
<actionGroup ref="AdminShipThePendingOrderActionGroup" stepKey="shipTheOrder"/>

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenOrderViewPageActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="StorefrontOpenOrderViewPageActionGroup">
12+
<annotations>
13+
<description>Navigates to Storefront Order View page</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="orderId" type="string"/>
17+
</arguments>
18+
<amOnPage url="{{StorefrontCustomerOrderViewPage.url(orderId)}}" stepKey="goToOrderViewPage"/>
19+
<waitForPageLoad stepKey="waitForPageLoad"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminCheckingCreditMemoUpdateTotalsTest.xml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,15 @@
5858
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="startCreateInvoice"/>
5959
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="submitInvoice"/>
6060

61-
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrderPage"/>
62-
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
63-
<grabTextFrom selector="{{AdminOrdersGridSection.orderIdByIncrementId($createCustomerCart.return$)}}" stepKey="getOrderId"/>
64-
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrdersGridById">
65-
<argument name="orderId" value="{$getOrderId}"/>
61+
<actionGroup ref="AdminOpenOrderByEntityIdActionGroup" stepKey="openAdminOrderViewPage">
62+
<argument name="entityId" value="$createCustomerCart.return$"/>
6663
</actionGroup>
64+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="onOrderPage"/>
65+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clearFilters"/>
66+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="getOrderId"/>
67+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterOrdersGridById"/>
6768

68-
<actionGroup ref="StartToCreateCreditMemoActionGroup" stepKey="startToCreateCreditMemo">
69-
<argument name="orderId" value="{$getOrderId}"/>
70-
</actionGroup>
69+
<actionGroup ref="AdminStartToCreateCreditMemoFromOrderPageActionGroup" stepKey="startToCreateCreditMemo"/>
7170
<fillField selector="{{AdminCreditMemoTotalSection.refundShipping}}" userInput="0" stepKey="setRefundShipping"/>
7271
<actionGroup ref="UpdateCreditMemoTotalsActionGroup" stepKey="updateCreditMemoTotals"/>
7372
<actionGroup ref="SubmitCreditMemoActionGroup" stepKey="submitCreditMemo"/>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoForOrderWithCashOnDeliveryTest.xml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,14 @@
5959
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
6060
</after>
6161

62-
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrderPage"/>
63-
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
64-
<grabTextFrom selector="{{AdminOrdersGridSection.orderIdByIncrementId($createCustomerCart.return$)}}" stepKey="grabOrderId"/>
65-
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrdersGridById">
66-
<argument name="orderId" value="{$grabOrderId}"/>
62+
<actionGroup ref="AdminOpenOrderByEntityIdActionGroup" stepKey="openAdminOrderViewPage">
63+
<argument name="entityId" value="$createCustomerCart.return$"/>
6764
</actionGroup>
65+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="onOrderPage"/>
66+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clearFilters"/>
67+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="grabOrderId"/>
68+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterOrdersGridById"/>
69+
6870

6971
<actionGroup ref="AdminOpenAndFillCreditMemoRefundActionGroup" stepKey="fillCreditMemoRefund">
7072
<argument name="itemQtyToRefund" value="1"/>
@@ -88,9 +90,8 @@
8890
<argument name="Customer" value="$$createCustomer$$"/>
8991
</actionGroup>
9092

91-
<actionGroup ref="StorefrontGoToCustomerOrderDetailsPageActionGroup" stepKey="openOrderDetailPage">
93+
<actionGroup ref="StorefrontOpenOrderViewPageActionGroup" stepKey="openOrderDetailPage">
9294
<argument name="orderId" value="$createCustomerCart.return$"/>
93-
<argument name="orderNumber" value="{$grabOrderId}"/>
9495
</actionGroup>
9596

9697
<actionGroup ref="StorefrontClickRefundTabCustomerOrderViewActionGroup" stepKey="clickRefund"/>

‎app/code/Magento/Sales/Test/Mftf/Test/StorefrontVerifyOrderShipmentForDecimalQuantityTest.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<after>
3232
<!--Clear Filters-->
3333
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="ClearFiltersAfter"/>
34-
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderListingFilters"/>
34+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clearOrderListingFilters"/>
3535
<deleteData createDataKey="createSimpleCategory" stepKey="deletePreReqCategory"/>
3636
<deleteData createDataKey="createSimpleProduct" stepKey="deletePreReqSimpleProduct"/>
3737
<!--Logout from customer account-->
@@ -85,9 +85,12 @@
8585
<!--Step10. Click place order-->
8686
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="placeOrder"/>
8787
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
88+
<actionGroup ref="StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup" stepKey="openOrderViewPage"/>
89+
<grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
90+
8891
<!--Step11. Go to admin Order page for newly created order-->
89-
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrdersGridById">
90-
<argument name="orderId" value="{$grabOrderNumber}"/>
92+
<actionGroup ref="AdminOpenOrderByEntityIdActionGroup" stepKey="filterOrdersGridById">
93+
<argument name="entityId" value="$grabOrderId"/>
9194
</actionGroup>
9295

9396
<click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>

0 commit comments

Comments
 (0)