Skip to content

Commit ccb3355

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/MC-25238' into 2.4-develop-pr86
2 parents 48aa89e + 92654aa commit ccb3355

3 files changed

+102
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
<argument name="address" defaultValue="US_Address_TX" type="entity"/>
1414
</arguments>
1515
<conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.estimateShippingAndTaxSummary}}" visible="false" stepKey="openShippingDetails"/>
16+
<waitForElementVisible selector="{{CheckoutCartSummarySection.country}}" stepKey="waitForSummarySectionLoad"/>
1617
<selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="{{address.country_id}}" stepKey="selectCountry"/>
1718
<selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{address.state}}" stepKey="selectState"/>
1819
<waitForElementVisible selector="{{CheckoutCartSummarySection.postcode}}" stepKey="waitForPostCodeVisible"/>
1920
<fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="{{address.postcode}}" stepKey="selectPostCode"/>
2021
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDiappear"/>
2122
</actionGroup>
22-
</actionGroups>
23+
</actionGroups>

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

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="StorefrontCheckoutWithDifferentShippingAndBillingAddressAndCreateCustomerAfterCheckoutTest">
11+
<annotations>
12+
<stories value="Checkout"/>
13+
<title value="Verify UK customer checkout with different billing and shipping address and register customer after checkout"/>
14+
<description value="Checkout as UK customer with different shipping/billing address and register checkout method"/>
15+
<severity value="CRITICAL"/>
16+
<testCaseId value="MC-28288"/>
17+
<group value="mtf_migrated"/>
18+
<group value="checkout"/>
19+
</annotations>
20+
21+
<before>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>
23+
<createData entity="SimpleProduct2" stepKey="simpleProduct">
24+
<field key="price">50.00</field>
25+
</createData>
26+
</before>
27+
<after>
28+
<!-- Sign out Customer from storefront -->
29+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
30+
<deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
31+
<actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
32+
<argument name="customerEmail" value="UKCustomer.email"/>
33+
</actionGroup>
34+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearCustomersGridFilter"/>
35+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
36+
</after>
37+
38+
<!--Open Product page in StoreFront and assert product and price range -->
39+
<actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKeyActionGroup" stepKey="openProductPageAndVerifyProduct">
40+
<argument name="product" value="$simpleProduct$"/>
41+
</actionGroup>
42+
43+
<!--Add product to the cart -->
44+
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addProductToCart">
45+
<argument name="product" value="$simpleProduct$"/>
46+
</actionGroup>
47+
48+
<!--Open View and edit -->
49+
<actionGroup ref="ClickViewAndEditCartFromMiniCartActionGroup" stepKey="openCartFromMiniCart"/>
50+
51+
<!-- Fill the Estimate Shipping and Tax section -->
52+
<actionGroup ref="CheckoutFillEstimateShippingAndTaxActionGroup" stepKey="fillEstimateShippingAndTaxFields"/>
53+
<click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="goToCheckout"/>
54+
<waitForPageLoad stepKey="waitForPageToLoad"/>
55+
56+
<!-- Fill the guest form -->
57+
<actionGroup ref="FillGuestCheckoutShippingAddressFormActionGroup" stepKey="fillGuestShippingAddress">
58+
<argument name="customer" value="UKCustomer"/>
59+
<argument name="customerAddress" value="updateCustomerUKAddress"/>
60+
</actionGroup>
61+
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShipping"/>
62+
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="goToBillingStep"/>
63+
<waitForElementVisible selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="waitForSameBillingAndShippingAddressCheckboxVisible"/>
64+
<uncheckOption selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="uncheckSameBillingAndShippingAddress"/>
65+
<conditionalClick selector="{{CheckoutShippingSection.editAddressButton}}" dependentSelector="{{CheckoutShippingSection.editAddressButton}}" visible="true" stepKey="clickEditBillingAddressButton"/>
66+
67+
<!-- Fill Billing Address -->
68+
<actionGroup ref="StorefrontFillBillingAddressActionGroup" stepKey="fillBillingAddressForm"/>
69+
<click selector="{{CheckoutPaymentSection.update}}" stepKey="clickOnUpdateBillingAddressButton"/>
70+
71+
<!--Place order -->
72+
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
73+
<seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
74+
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>
75+
76+
<!-- Register customer after checkout -->
77+
<actionGroup ref="StorefrontRegisterCustomerAfterCheckoutActionGroup" stepKey="registerCustomer"/>
78+
79+
<!-- Open Order Page in admin -->
80+
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrder">
81+
<argument name="orderId" value="{$orderId}"/>
82+
</actionGroup>
83+
84+
<!-- Assert Grand Total -->
85+
<see selector="{{AdminOrderTotalSection.grandTotal}}" userInput="$55.00" stepKey="seeGrandTotal"/>
86+
<see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeOrderStatus"/>
87+
88+
<!-- Ship the order and assert the status -->
89+
<actionGroup ref="GoToShipmentIntoOrderActionGroup" stepKey="goToShipment"/>
90+
<actionGroup ref="SubmitShipmentIntoOrderActionGroup" stepKey="submitShipment"/>
91+
92+
<!-- Assert order buttons -->
93+
<actionGroup ref="AdminAssertOrderAvailableButtonsActionGroup" stepKey="assertOrderButtons"/>
94+
</test>
95+
</tests>

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,17 @@
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10-
<test name="StorefrontCheckoutWithDifferentShippingAndBillingAddressAndRegisterCustomerAfterCheckoutTest">
10+
<test name="StorefrontCheckoutWithDifferentShippingAndBillingAddressAndRegisterCustomerAfterCheckoutTest" deprecated="Use StorefrontCheckoutWithDifferentShippingAndBillingAddressAndCreateCustomerAfterCheckoutTest instead">
1111
<annotations>
1212
<stories value="Checkout"/>
13-
<title value="Verify UK customer checkout with different billing and shipping address and register customer after checkout"/>
13+
<title value="DEPRECATED. Verify UK customer checkout with different billing and shipping address and register customer after checkout"/>
1414
<description value="Checkout as UK customer with different shipping/billing address and register checkout method"/>
1515
<severity value="CRITICAL"/>
1616
<testCaseId value="MC-14712"/>
1717
<group value="mtf_migrated"/>
18+
<skip>
19+
<issueId value="DEPRECATED">Use StorefrontCheckoutWithDifferentShippingAndBillingAddressAndCreateCustomerAfterCheckoutTest instead</issueId>
20+
</skip>
1821
</annotations>
1922

2023
<before>

0 commit comments

Comments
 (0)