Skip to content

magento/partners-magento2b2b#244: Allow new billing address when addi… #31045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 10, 2020
Merged

magento/partners-magento2b2b#244: Allow new billing address when addi… #31045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions ...ento/Checkout/Test/Mftf/ActionGroup/StorefrontClickUpdateAddressInCheckoutActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="StorefrontClickUpdateAddressInCheckoutActionGroup">
<annotations>
<description>Clicks the Update button on the checkout page when entering a New Address.</description>
</annotations>
<waitForElementVisible selector="{{CheckoutShippingSection.updateAddress}}" stepKey="waitForUpdateButton"/>
<click selector="{{CheckoutShippingSection.updateAddress}}" stepKey="clickUpdateButton"/>
<waitForPageLoad stepKey="waitForAddressSaved"/>
</actionGroup>
</actionGroups>
22 changes: 22 additions & 0 deletions ...out/Test/Mftf/ActionGroup/StorefrontSelectAddressInCheckoutAddressDropDownActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="StorefrontSelectAddressInCheckoutAddressDropDownActionGroup">
<annotations>
<description>Selects the specified option in the address selection drop down on the storefront Checkout page.</description>
</annotations>
<arguments>
<argument name="address" defaultValue="New Address" type="string"/>
</arguments>
<waitForElementVisible selector="{{CheckoutPaymentSection.addressDropdown}}" stepKey="waitForAddressDropDownToBeVisible"/>
<selectOption selector="{{CheckoutPaymentSection.addressDropdown}}" userInput="{{address}}" stepKey="selectAddressOption"/>
<waitForPageLoad stepKey="waitForAddressLoad"/>
</actionGroup>
</actionGroups>
22 changes: 22 additions & 0 deletions ...st/Mftf/ActionGroup/StorefrontSelectCustomerAddressOnPaymentStepInCheckoutActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="StorefrontSelectCustomerAddressOnPaymentStepInCheckoutActionGroup">
<annotations>
<description>Selects the specified address after 'Change Address' pop up has been opened on the Storefront Checkout page on the 'Payment' step.</description>
</annotations>
<arguments>
<argument name="address" type="string"/>
</arguments>
<waitForElementVisible selector="{{CheckoutBillingAddressSearchSection.selectButton(address)}}" stepKey="waitForAddress"/>
<click selector="{{CheckoutBillingAddressSearchSection.selectButton(address)}}" stepKey="clickSelectForAddress"/>
<waitForElementNotVisible selector="{{CheckoutShippingAddressSearchSection.popupSelectShippingAddress}}" stepKey="waitForPopupClosed"/>
</actionGroup>
</actionGroups>
2 changes: 2 additions & 0 deletions app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderDetailsSection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
<element name="billingAddressBlock" type="block" selector=".box-order-billing-address > .box-content > address"/>
<element name="discountSalesRule" type="text" selector="tr.discount span.price"/>
<element name="shippingTotalDescription" type="text" selector="#my-orders-table tr.shipping th.mark"/>
<element name="tax" type="text" selector=".totals-tax .price"/>
<element name="grandTotalIncludingTax" type="text" selector=".grand_total_incl .amount"/>
<element name="grandTotalPrice" type="text" selector="tr.grand_total span.price"/>
<element name="paymentMethod" type="text" selector=".box-order-billing-method dt.title"/>
<element name="shippingMethod" type="text" selector=".box-order-shipping-method div.box-content"/>
Expand Down
18 changes: 18 additions & 0 deletions app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminGoToNewTaxRulePageActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminGoToNewTaxRulePageActionGroup">
<annotations>
<description>Go to the create New Tax Rule page.</description>
</annotations>
<amOnPage url="{{AdminNewTaxRulePage.url}}" stepKey="goToNewTaxRulePage"/>
<waitForPageLoad stepKey="waitForTaxRulePage"/>
</actionGroup>
</actionGroups>
20 changes: 20 additions & 0 deletions app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminSaveTaxRuleActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminSaveTaxRuleActionGroup">
<annotations>
<description>Clicks the Save Rule button on the Tax Rule page.</description>
</annotations>
<waitForElementVisible selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="waitForSaveButton"/>
<click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveButton"/>
<waitForPageLoad stepKey="waitForSave"/>
<waitForText selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rule." stepKey="waitForSuccessMessage"/>
</actionGroup>
</actionGroups>