Skip to content

Commit 521ef9c

Browse files
ENGCOM-8454: [MFTF] Add StorefrontCheckoutClickSaveAddressButtonActionGroup #30528
- Merge Pull Request #30528 from Usik2203/magento2:save-checkout-address - Merged commits: 1. 8e463fe 2. a54cc96 3. 657420d 4. d804a12 5. fad49b8 6. 8d8a4bf 7. 170620e 8. cc82610
2 parents 252dd90 + cc82610 commit 521ef9c

6 files changed

+28
-11
lines changed
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="StorefrontCheckoutClickSaveAddressButtonActionGroup">
12+
<annotations>
13+
<description>Click Save Address button on checkout.</description>
14+
</annotations>
15+
16+
<click selector="{{CheckoutShippingSection.saveAddress}}" stepKey="saveAddress"/>
17+
<waitForPageLoad stepKey="waitForAddressSaved"/>
18+
</actionGroup>
19+
</actionGroups>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
<argument name="classPrefix" value="._show"/>
5050
</actionGroup>
5151
<!--Click "Save Addresses" -->
52-
<click selector="{{CheckoutShippingSection.saveAddress}}" stepKey="saveAddress"/>
53-
<waitForPageLoad stepKey="waitForAddressSaved"/>
52+
<actionGroup ref="StorefrontCheckoutClickSaveAddressButtonActionGroup" stepKey="saveAddress"/>
53+
<comment userInput="Adding the comment to replace waitForAddressSaved action for preserving Backward Compatibility" stepKey="waitForAddressSaved"/>
5454
<dontSeeElement selector="{{StorefrontCheckoutAddressPopupSection.newAddressModalPopup}}" stepKey="dontSeeModalPopup"/>
5555
<!--Select Shipping Rate "Flat Rate" and click "Next" button-->
5656
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShipping"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<actionGroup ref="FillShippingAddressOneStreetActionGroup" stepKey="changeAddress">
6161
<argument name="address" value="UK_Not_Default_Address"/>
6262
</actionGroup>
63-
<click selector="{{CheckoutShippingSection.saveAddress}}" stepKey="saveNewAddress"/>
63+
<actionGroup ref="StorefrontCheckoutClickSaveAddressButtonActionGroup" stepKey="saveNewAddress"/>
6464

6565
<!--Select Shipping Rate-->
6666
<scrollTo selector="{{CheckoutShippingMethodsSection.next}}" stepKey="scrollToShippingRate"/>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,8 @@
6969
<actionGroup ref="FillShippingAddressOneStreetActionGroup" stepKey="changeAddress">
7070
<argument name="address" value="UK_Not_Default_Address"/>
7171
</actionGroup>
72-
<click selector="{{CheckoutShippingSection.saveAddress}}" stepKey="saveNewAddress"/>
73-
<waitForPageLoad stepKey="waitForAddressSaving"/>
74-
72+
<actionGroup ref="StorefrontCheckoutClickSaveAddressButtonActionGroup" stepKey="saveNewAddress"/>
73+
<comment userInput="Adding the comment to replace waitForAddressSaving action for preserving Backward Compatibility" stepKey="waitForAddressSaving"/>
7574
<!-- Click next button to open payment section -->
7675
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext"/>
7776

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
</actionGroup>
5353

5454
<!--Click "Save Addresses" -->
55-
<click selector="{{CheckoutShippingSection.saveAddress}}" stepKey="saveAddress"/>
56-
<waitForPageLoad stepKey="waitForAddressSaved"/>
55+
<actionGroup ref="StorefrontCheckoutClickSaveAddressButtonActionGroup" stepKey="saveAddress"/>
56+
<comment userInput="Adding the comment to replace waitForAddressSaved action for preserving Backward Compatibility" stepKey="waitForAddressSaved"/>
5757
<dontSeeElement selector="{{StorefrontCheckoutAddressPopupSection.newAddressModalPopup}}" stepKey="dontSeeModalPopup"/>
5858

5959
<!--Select Shipping Rate "Flat Rate"-->

app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,8 @@
114114
<argument name="Address" value="US_Address_CA"/>
115115
<argument name="classPrefix" value="._show"/>
116116
</actionGroup>
117-
<click stepKey="saveAddress" selector="{{CheckoutShippingSection.saveAddress}}"/>
118-
119-
<waitForPageLoad stepKey="waitForAddressSaved"/>
117+
<actionGroup ref="StorefrontCheckoutClickSaveAddressButtonActionGroup" stepKey="saveAddress"/>
118+
<comment userInput="Adding the comment to replace waitForAddressSaved action for preserving Backward Compatibility" stepKey="waitForAddressSaved"/>
120119
<see stepKey="seeAddress2" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{SimpleTaxCA.state}}"/>
121120
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext2"/>
122121

0 commit comments

Comments
 (0)