Skip to content

Commit cd7502f

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-8436: [MFTF] Added AdminClickGetShippingMethodsAndRatesActionGroup and AdminSelectFixedShippingMethodActionGroup #30779
- Merge Pull Request #30779 from Usik2203/magento2:select-shipping-method - Merged commits: 1. c62a878 2. df9280b 3. 719a6bb
2 parents e9fa180 + 719a6bb commit cd7502f

8 files changed

+60
-22
lines changed

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,10 @@
173173
</actionGroup>
174174
<!-- Select shipping method -->
175175
<comment userInput="Select shipping method" stepKey="selectShippingMethod"/>
176-
<click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
177-
<waitForPageLoad stepKey="waitForShippingMethods"/>
178-
<click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
179-
<waitForPageLoad stepKey="waitForShippingMethodLoad"/>
176+
<actionGroup ref="AdminClickGetShippingMethodsAndRatesActionGroup" stepKey="openShippingMethod"/>
177+
<comment userInput="Adding the comment to replace action for preserving Backward Compatibility" stepKey="waitForShippingMethods"/>
178+
<actionGroup ref="AdminSelectFixedShippingMethodActionGroup" stepKey="chooseShippingMethod"/>
179+
<comment userInput="Adding the comment to replace action for preserving Backward Compatibility" stepKey="waitForShippingMethodLoad"/>
180180
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="clickSubmitOrder" />
181181
<actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="checkOrderSuccessfullyCreated"/>
182182
</test>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminClickGetShippingMethodsAndRatesActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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="AdminClickGetShippingMethodsAndRatesActionGroup">
12+
<annotations>
13+
<description>Click 'Get Shipping Methods And Rates' button on the admin create order page.</description>
14+
</annotations>
15+
16+
<click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
17+
<waitForPageLoad stepKey="waitForShippingMethods"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSelectFixedShippingMethodActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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="AdminSelectFixedShippingMethodActionGroup">
12+
<annotations>
13+
<description>Select Fixed Shipping Method on the admin create order page.</description>
14+
</annotations>
15+
16+
<click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
17+
<waitForPageLoad stepKey="waitForShippingMethodLoad"/>
18+
</actionGroup>
19+
</actionGroups>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@
6565
<actionGroup ref="SelectBankTransferPaymentMethodActionGroup" stepKey="selectPaymentMethod"/>
6666

6767
<!-- Select shipping method -->
68-
<click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
69-
<waitForPageLoad stepKey="waitForShippingMethods"/>
70-
<click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
71-
<waitForPageLoad stepKey="waitForShippingMethodLoad"/>
68+
<actionGroup ref="AdminClickGetShippingMethodsAndRatesActionGroup" stepKey="openShippingMethod"/>
69+
<comment userInput="Adding the comment to replace action for preserving Backward Compatibility" stepKey="waitForShippingMethods"/>
70+
<actionGroup ref="AdminSelectFixedShippingMethodActionGroup" stepKey="chooseShippingMethod"/>
71+
<comment userInput="Adding the comment to replace action for preserving Backward Compatibility" stepKey="waitForShippingMethodLoad"/>
7272

7373
<!-- Submit order -->
7474
<actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@
6262
</actionGroup>
6363

6464
<!-- Select shipping method -->
65-
<click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
66-
<waitForPageLoad stepKey="waitForShippingMethods"/>
67-
<click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
68-
<waitForPageLoad stepKey="waitForShippingMethodLoad"/>
65+
<actionGroup ref="AdminClickGetShippingMethodsAndRatesActionGroup" stepKey="openShippingMethod"/>
66+
<comment userInput="Adding the comment to replace action for preserving Backward Compatibility" stepKey="waitForShippingMethods"/>
67+
<actionGroup ref="AdminSelectFixedShippingMethodActionGroup" stepKey="chooseShippingMethod"/>
68+
<comment userInput="Adding the comment to replace action for preserving Backward Compatibility" stepKey="waitForShippingMethodLoad"/>
6969

7070
<!-- Select cash on delivery payment method -->
7171
<actionGroup ref="SelectCashOnDeliveryPaymentMethodActionGroup" stepKey="selectPaymentMethod"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@
5959
</actionGroup>
6060

6161
<!-- Select shipping method -->
62-
<click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
63-
<waitForPageLoad stepKey="waitForShippingMethods"/>
64-
<click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
65-
<waitForPageLoad stepKey="waitForShippingMethodLoad"/>
62+
<actionGroup ref="AdminClickGetShippingMethodsAndRatesActionGroup" stepKey="openShippingMethod"/>
63+
<comment userInput="Adding the comment to replace action for preserving Backward Compatibility" stepKey="waitForShippingMethods"/>
64+
<actionGroup ref="AdminSelectFixedShippingMethodActionGroup" stepKey="chooseShippingMethod"/>
65+
<comment userInput="Adding the comment to replace action for preserving Backward Compatibility" stepKey="waitForShippingMethodLoad"/>
6666

6767
<!-- Submit order -->
6868
<actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@
182182

183183
<!-- Select Free Shipping -->
184184
<waitForElementVisible selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="waitForShippingSection"/>
185-
<click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
186-
<waitForPageLoad stepKey="waitForShippingMethods"/>
185+
<actionGroup ref="AdminClickGetShippingMethodsAndRatesActionGroup" stepKey="openShippingMethod"/>
186+
<comment userInput="Adding the comment to replace action for preserving Backward Compatibility" stepKey="waitForShippingMethods"/>
187187
<click selector="{{AdminOrderFormPaymentSection.freeShippingOption}}" stepKey="chooseShippingMethod"/>
188188
<waitForPageLoad stepKey="waitForPageToLoad"/>
189189
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@
8484
</actionGroup>
8585

8686
<!-- Select shipping method -->
87-
<click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
88-
<waitForPageLoad stepKey="waitForShippingMethods"/>
89-
<click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
90-
<waitForPageLoad stepKey="waitForShippingMethodLoad"/>
87+
<actionGroup ref="AdminClickGetShippingMethodsAndRatesActionGroup" stepKey="openShippingMethod"/>
88+
<comment userInput="Adding the comment to replace action for preserving Backward Compatibility" stepKey="waitForShippingMethods"/>
89+
<actionGroup ref="AdminSelectFixedShippingMethodActionGroup" stepKey="chooseShippingMethod"/>
90+
<comment userInput="Adding the comment to replace action for preserving Backward Compatibility" stepKey="waitForShippingMethodLoad"/>
9191

9292
<!-- Submit order -->
9393
<actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>

0 commit comments

Comments
 (0)