Skip to content

Commit 605a800

Browse files
engcom-Charlieengcom-Charlie
authored
Merge branch '2.4-develop' into fix-for-issue-40092
2 parents 957ddd7 + f0b6603 commit 605a800

File tree

30 files changed

+569
-326
lines changed

30 files changed

+569
-326
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductInRecentlyOrderedWidgetActionGroup.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
</arguments>
1818

1919
<waitForElementVisible selector="{{StorefrontWidgetsSection.widgetRecentlyOrderedProductsGrid}}" stepKey="waitWidgetRecentlyOrderedProductsGrid"/>
20-
<see selector="{{StorefrontWidgetsSection.widgetRecentlyOrderedProductsGrid}}" userInput="{{product.name}}" stepKey="seeProductInRecentlyOrderedWidget"/>
20+
<waitForText selector="{{StorefrontWidgetsSection.widgetRecentlyOrderedProductsGrid}}" userInput="{{product.name}}" stepKey="seeProductInRecentlyOrderedWidget"/>
2121
</actionGroup>
2222
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductInRecentlyViewedWidgetActionGroup.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
</arguments>
1919

2020
<waitForElementVisible selector="{{StorefrontWidgetsSection.widgetRecentlyViewedProductsGrid}}" stepKey="waitWidgetRecentlyViewedProductsGrid"/>
21-
<see selector="{{StorefrontWidgetsSection.widgetRecentlyViewedProductsGrid}}" userInput="{{product.name}}" stepKey="seeProductInRecentlyViewedWidget"/>
21+
<waitForText selector="{{StorefrontWidgetsSection.widgetRecentlyViewedProductsGrid}}" userInput="{{product.name}}" stepKey="seeProductInRecentlyViewedWidget"/>
2222
</actionGroup>
2323
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<element name="productPriceLinkAfterLabel" type="text" selector="//span[@class='price-label'][contains(text(),'{{var1}}')]/following::span[contains(text(), '{{var2}}')]" parameterized="true"/>
3232
<element name="ProductAddToCartByName" type="button" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocart')]" parameterized="true"/>
3333
<!--<element name="ProductAddToCompareByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocompare')]" parameterized="true"/>-->
34-
<element name="ProductAddToCompareByName" type="text" selector="//*[contains(@class,'product-item-info')][descendant::a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocompare')]" parameterized="true"/>
34+
<element name="ProductAddToCompareByName" type="text" selector="//*[contains(@class,'product-item-info')][descendant::a[contains(text(), '{{var1}}')]]//*[(name()='a' or name()='button') and contains(@class, 'tocompare')]" parameterized="true"/>
3535
<element name="ProductImageByNameAndSrc" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//img[contains(@src, '{{src}}')]" parameterized="true"/>
3636
<element name="ProductStockUnavailable" type="text" selector="//*[text()='Out of stock']"/>
3737
<element name="listedProductOnProductPage" type="block" selector="//div[contains(@aria-labelledBy,'{{attribute_code}}')]//div[@aria-label='{{attribute_name}}']" parameterized="true"/>

‎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/Cms/Test/Mftf/ActionGroup/AdminSelectRecentlyViewedProductWidgetFromInsertWidgetSlideOutActionGroup.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="AdminSelectRecentlyViewedProductWidgetFromInsertWidgetSlideOutActionGroup" extends="AdminInsertRecentlyViewedWidgetActionGroup">
12+
<annotations>
13+
<description>Fills out the Widget Options form for the Recently Viewed Products widget from the Insert Widget slide out.</description>
14+
</annotations>
15+
<remove keyForRemoval="expandContentSectionIfNotVisible"/>
16+
<remove keyForRemoval="clickNextShowHideEditorIfVisible"/>
17+
<remove keyForRemoval="checkCMSContent"/>
18+
<remove keyForRemoval="clickNextSave"/>
19+
<remove keyForRemoval="waitForPageActionSave"/>
20+
<remove keyForRemoval="waitForSaveSuccess"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,4 +119,10 @@
119119
<data key="identifier" unique="suffix" >block</data>
120120
<data key="active">true</data>
121121
</entity>
122+
<entity name="PageBuilderHtmlCmsHomePageContent" type="pagebuilder_html_property">
123+
<data key="name">HTML</data>
124+
<data key="section">general</data>
125+
<data key="value">CMS homepage content goes here</data>
126+
<data key="fieldName">html</data>
127+
</entity>
122128
</entities>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -658,4 +658,21 @@
658658
<data key="default_shipping">Yes</data>
659659
<requiredEntity type="region">RegionCA</requiredEntity>
660660
</entity>
661+
<entity name="US_Address_LI" type="address">
662+
<data key="firstname">John</data>
663+
<data key="lastname">Doe</data>
664+
<data key="company">Magento</data>
665+
<array key="street">
666+
<item>1125 Tri-State Parkway</item>
667+
<item>Suite 700</item>
668+
</array>
669+
<data key="city">Gurnee</data>
670+
<data key="state">Illinois</data>
671+
<data key="country_id">US</data>
672+
<data key="country">United States</data>
673+
<data key="postcode">60031</data>
674+
<data key="telephone">3232380670</data>
675+
<data key="default_billing">Yes</data>
676+
<data key="default_shipping">Yes</data>
677+
</entity>
661678
</entities>

‎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/EncryptionKey/Test/Mftf/ActionGroup/AdminEncryptionKeyChangeKeyAutoActionGroup.xml‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)