Skip to content

Commit 3adf9f4

Browse files
chandrakalahanchinalchandrakalahanchinal
committed
Merge branch 'ACQE-8477' into ACQE-functional-deployment-version16
2 parents 9528b91 + c00a592 commit 3adf9f4

File tree

4 files changed

+116
-8
lines changed

4 files changed

+116
-8
lines changed

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontRemoveProductsInMultiAddressCheckoutActionGroup.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 2025 Adobe
5+
* All Rights Reserved.
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="StorefrontRemoveProductsInMultiAddressCheckoutActionGroup">
12+
<annotations>
13+
<description>Removes the product in multi address checkout page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="sequenceNumber" type="string" defaultValue="1"/>
17+
</arguments>
18+
<waitForPageLoad stepKey="waitForCartSummaryPageToLoad"/>
19+
<waitForElementClickable selector="{{MultishippingSection.removeItemLink(sequenceNumber)}}" stepKey="waitForRemoveLinkClickable"/>
20+
<click selector="{{MultishippingSection.removeItemLink('sequenceNumber')}}" stepKey="clickOnRemoveItemLink"/>
21+
</actionGroup>
22+
</actionGroups>

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

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
9+
<test name="StorefrontAssertAddressDisappearanceAfterItemRemovalTest">
10+
<annotations>
11+
<features value="Multishipment"/>
12+
<stories value="Checkout with multiple addresses"/>
13+
<title value="Verifies address retention on item removal in multi-shipping checkout"/>
14+
<description value="Addresses vanish from multi-shipping checkout when multiple items are removed from the cart"/>
15+
<severity value="MAJOR"/>
16+
<testCaseId value="AC-15541"/>
17+
<group value="Multishipment"/>
18+
</annotations>
19+
<before>
20+
<!-- Precondition Step 1: Create a Simple Product -->
21+
<createData entity="SimpleProduct" stepKey="createProduct"/>
22+
<!-- Precondition Step 2: A registered customer with at least 3 registered addresses. -->
23+
<createData entity="Simple_Customer_Multiple_Addresses" stepKey="createCustomer"/>
24+
</before>
25+
<after>
26+
<!-- Delete data -->
27+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
28+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
29+
<!--Logout from customer account-->
30+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutStorefront"/>
31+
<!--Logout from admin account-->
32+
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
33+
</after>
34+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
35+
<!-- Step 1: Login as Storefront Customer -->
36+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
37+
<argument name="Customer" value="$$createCustomer$$"/>
38+
</actionGroup>
39+
<!-- Step 2: Open the simple product page -->
40+
<actionGroup ref="StorefrontAddSimpleProductWithQtyActionGroup" stepKey="addProductOneToCart">
41+
<argument name="product" value="$$createProduct$$"/>
42+
<argument name="quantity" value="3"/>
43+
</actionGroup>
44+
<!-- Step 3: From mini cart click `View and Edit Cart` link-->
45+
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart"/>
46+
<actionGroup ref="ClickViewAndEditCartFromMiniCartActionGroup" stepKey="goToShoppingCartFromMiniCart"/>
47+
<waitForPageLoad stepKey="waitForViewAndEditCartToOpen"/>
48+
<!-- Step 4: Click Link `Checkout with Multiple Addresses -->
49+
<click stepKey="clickOnCheckoutWithMultipleAddresses" selector="{{MultishippingSection.checkoutWithMultipleAddresses}}"/>
50+
<waitForPageLoad stepKey="waitForMultiCheckoutPageToLoad"/>
51+
<!-- Step 5: Select different addresses for each item -->
52+
<actionGroup ref="StorefrontSelectAddressActionGroup" stepKey="selectCAAddress">
53+
<argument name="sequenceNumber" value="3"/>
54+
<argument name="option" value="{{Customer_Address.ca_address}}"/>
55+
</actionGroup>
56+
<actionGroup ref="StorefrontSelectAddressActionGroup" stepKey="selectNYAddress">
57+
<argument name="sequenceNumber" value="2"/>
58+
<argument name="option" value="{{Customer_Address.ny_address}}"/>
59+
</actionGroup>
60+
<actionGroup ref="StorefrontSelectAddressActionGroup" stepKey="selectBRAddress">
61+
<argument name="sequenceNumber" value="1"/>
62+
<argument name="option" value="{{Customer_Address.br_address}}"/>
63+
</actionGroup>
64+
<actionGroup ref="StorefrontUpdateMultishippingItemsQuantityAndAddressesActionGroup" stepKey="clickOnUpdateQtyAndAddress"/>
65+
<!-- Step 6: Now click Remove Item link one by one for each item -->
66+
<actionGroup ref="StorefrontRemoveProductsInMultiAddressCheckoutActionGroup" stepKey="removeFirstItem">
67+
<argument name="sequenceNumber" value="1"/>
68+
</actionGroup>
69+
<actionGroup ref="StorefrontRemoveProductsInMultiAddressCheckoutActionGroup" stepKey="removeSecondItem">
70+
<argument name="sequenceNumber" value="2"/>
71+
</actionGroup>
72+
<waitForPageLoad stepKey="waitForCartSummaryPageToLoadAfterRemovalOfFirstItem"/>
73+
<!-- Remove the last item -->
74+
<actionGroup ref="StorefrontRemoveProductsInMultiAddressCheckoutActionGroup" stepKey="removeThirdItem"/>
75+
</test>
76+
</tests>

‎app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -533,4 +533,13 @@
533533
<data key="group">General</data>
534534
<requiredEntity type="address">US_Address_Bris</requiredEntity>
535535
</entity>
536+
<entity name="Simple_Customer_Multiple_Addresses" type="customer" extends="Simple_US_Customer_With_Brisbane_Address">
537+
<requiredEntity type="address">US_Address_CA</requiredEntity>
538+
<requiredEntity type="address">US_Address_NY_Not_Default_Address</requiredEntity>
539+
</entity>
540+
<entity name="Customer_Address" type="customer">
541+
<data key="ny_address">John Doe, 368 Broadway St. Apt. 113, New York, New York 10001, United States</data>
542+
<data key="ca_address">John Doe, 7700 West Parmer Lane 113, Los Angeles, California 90001, United States</data>
543+
<data key="br_address">John Doe, 3976 Thunder Road, Brisbane, California 94005, United States</data>
544+
</entity>
536545
</entities>

‎app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection/MultishippingSection.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
@@ -24,5 +24,6 @@
2424
<element name="updateQtyAndAddress" type="button" selector="//button[@type='submit' and @class='action update']"/>
2525
<element name="attentionMessage" type="text" selector="//div[@class='modal-inner-wrap']//div[contains(text(),'Maximum qty allowed for Shipping to multiple addresses is 10')]"/>
2626
<element name="acceptAttention" type="button" selector="//button[@class='action-primary action-accept']//span[contains(text(),'OK')]"/>
27+
<element name="removeItemLink" type="select" selector="//tr[position()={{sequenceNumber}}]//a[@class='action delete']" parameterized="true"/>
2728
</section>
2829
</sections>

0 commit comments

Comments
 (0)