Skip to content

Commit 731b4f3

Browse files
joanhejoanhe
committed
Merge branch '244_allow_new_billing_address' into 2.4-develop-pr
2 parents e0561ce + e0b71b9 commit 731b4f3

6 files changed

+103
-0
lines changed

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontClickUpdateAddressInCheckoutActionGroup.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="StorefrontClickUpdateAddressInCheckoutActionGroup">
12+
<annotations>
13+
<description>Clicks the Update button on the checkout page when entering a New Address.</description>
14+
</annotations>
15+
<waitForElementVisible selector="{{CheckoutShippingSection.updateAddress}}" stepKey="waitForUpdateButton"/>
16+
<click selector="{{CheckoutShippingSection.updateAddress}}" stepKey="clickUpdateButton"/>
17+
<waitForPageLoad stepKey="waitForAddressSaved"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectAddressInCheckoutAddressDropDownActionGroup.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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="StorefrontSelectAddressInCheckoutAddressDropDownActionGroup">
12+
<annotations>
13+
<description>Selects the specified option in the address selection drop down on the storefront Checkout page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="address" defaultValue="New Address" type="string"/>
17+
</arguments>
18+
<waitForElementVisible selector="{{CheckoutPaymentSection.addressDropdown}}" stepKey="waitForAddressDropDownToBeVisible"/>
19+
<selectOption selector="{{CheckoutPaymentSection.addressDropdown}}" userInput="{{address}}" stepKey="selectAddressOption"/>
20+
<waitForPageLoad stepKey="waitForAddressLoad"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSelectCustomerAddressOnPaymentStepInCheckoutActionGroup.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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="StorefrontSelectCustomerAddressOnPaymentStepInCheckoutActionGroup">
12+
<annotations>
13+
<description>Selects the specified address after 'Change Address' pop up has been opened on the Storefront Checkout page on the 'Payment' step.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="address" type="string"/>
17+
</arguments>
18+
<waitForElementVisible selector="{{CheckoutBillingAddressSearchSection.selectButton(address)}}" stepKey="waitForAddress"/>
19+
<click selector="{{CheckoutBillingAddressSearchSection.selectButton(address)}}" stepKey="clickSelectForAddress"/>
20+
<waitForElementNotVisible selector="{{CheckoutShippingAddressSearchSection.popupSelectShippingAddress}}" stepKey="waitForPopupClosed"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderDetailsSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<element name="billingAddressBlock" type="block" selector=".box-order-billing-address > .box-content > address"/>
1515
<element name="discountSalesRule" type="text" selector="tr.discount span.price"/>
1616
<element name="shippingTotalDescription" type="text" selector="#my-orders-table tr.shipping th.mark"/>
17+
<element name="tax" type="text" selector=".totals-tax .price"/>
18+
<element name="grandTotalIncludingTax" type="text" selector=".grand_total_incl .amount"/>
1719
<element name="grandTotalPrice" type="text" selector="tr.grand_total span.price"/>
1820
<element name="paymentMethod" type="text" selector=".box-order-billing-method dt.title"/>
1921
<element name="shippingMethod" type="text" selector=".box-order-shipping-method div.box-content"/>

‎app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminGoToNewTaxRulePageActionGroup.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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="AdminGoToNewTaxRulePageActionGroup">
12+
<annotations>
13+
<description>Go to the create New Tax Rule page.</description>
14+
</annotations>
15+
<amOnPage url="{{AdminNewTaxRulePage.url}}" stepKey="goToNewTaxRulePage"/>
16+
<waitForPageLoad stepKey="waitForTaxRulePage"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminSaveTaxRuleActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="AdminSaveTaxRuleActionGroup">
12+
<annotations>
13+
<description>Clicks the Save Rule button on the Tax Rule page.</description>
14+
</annotations>
15+
<waitForElementVisible selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="waitForSaveButton"/>
16+
<click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveButton"/>
17+
<waitForPageLoad stepKey="waitForSave"/>
18+
<waitForText selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rule." stepKey="waitForSuccessMessage"/>
19+
</actionGroup>
20+
</actionGroups>

0 commit comments

Comments
 (0)