Skip to content

Commit 18fbf1d

Browse files
mage-os-cimage-os-ci
committed
Merge branch '2.4-develop' of https://github.com/mage-os/mirror-magento2 into 2.4-develop
2 parents 406bf77 + 91eea4b commit 18fbf1d

File tree

20 files changed

+1437
-18
lines changed

20 files changed

+1437
-18
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
@@ -18,6 +18,7 @@
1818
<selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{address.state}}" stepKey="selectState"/>
1919
<waitForElementVisible selector="{{CheckoutCartSummarySection.postcode}}" stepKey="waitForPostCodeVisible"/>
2020
<fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="{{address.postcode}}" stepKey="selectPostCode"/>
21-
<waitForPageLoad stepKey="waitForLoadingMaskToDiappear"/>
21+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDiappear"/>
22+
<waitForAjaxLoad stepKey="waitForAjax"/>
2223
</actionGroup>
2324
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<element name="orderNumberText" type="text" selector=".checkout-success > p:nth-child(1)"/>
1919
<element name="continueShoppingButton" type="button" selector=".action.primary.continue" timeout="30"/>
2020
<element name="createAnAccount" type="button" selector="a[class='action primary'] [data-bind*=&quot;i18n: 'Create an Account'&quot;]" timeout="30"/>
21+
<element name="orderEmailAddress" type="text" selector="span[data-bind*=&quot;text: getEmailAddress()&quot;]" timeout="30"/>
2122
<element name="printLink" type="button" selector=".print" timeout="30"/>
2223
<element name="orderNumberWithoutLink" type="text" selector="//div[contains(@class, 'checkout-success')]//p/span"/>
2324
<element name="orderLinkByOrderNumber" type="text" selector="//div[contains(@class,'success')]//a[contains(.,'{{orderNumber}}')]" parameterized="true" timeout="30"/>

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

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminVerifyCustomerGroupNotLoggedInForGuestOrderTest">
12+
<annotations>
13+
<features value="Checkout"/>
14+
<stories value="Order view shows customer group for guest orders"/>
15+
<title value="Admin sees 'NOT LOGGED IN' customer group on guest order view"/>
16+
<description value="Place a guest order on storefront and verify the customer group is NOT LOGGED IN"/>
17+
<severity value="AVERAGE"/>
18+
<testCaseId value="AC-6430"/>
19+
<group value="checkout"/>
20+
</annotations>
21+
<before>
22+
<!-- Precondition Step 1:Create Simple Product and Customer -->
23+
<createData entity="SimpleProduct_100" stepKey="simpleProductOne"/>
24+
</before>
25+
<after>
26+
<!-- Admin log out -->
27+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
28+
<!-- Delete created product -->
29+
<deleteData createDataKey="simpleProductOne" stepKey="deleteSimpleProduct"/>
30+
</after>
31+
<!-- Step 1: Navigate to Frontend > place an order through check money with guest checkout. -->
32+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStorefrontPage"/>
33+
<!-- Add Simple Product to cart -->
34+
<actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductFromCategory">
35+
<argument name="productUrlKey" value="$simpleProductOne.custom_attributes[url_key]$"/>
36+
</actionGroup>
37+
<actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
38+
<argument name="product" value="$$simpleProductOne$$"/>
39+
<argument name="productCount" value="1"/>
40+
</actionGroup>
41+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
42+
<!-- Guest Checkout Process-->
43+
<actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
44+
<argument name="customerVar" value="CustomerEntityOne"/>
45+
<argument name="customerAddressVar" value="CustomerAddressSimple"/>
46+
</actionGroup>
47+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="guestSelectCheckMoneyOrderPayment"/>
48+
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="checkoutPlaceOrder"/>
49+
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
50+
<!-- Step 2: Navigate to admin panel > sales > orders > check customer group -->
51+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
52+
<actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderById">
53+
<argument name="orderId" value="$grabOrderNumber"/>
54+
</actionGroup>
55+
<actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="clickOrderRow"/>
56+
<waitForElementVisible selector="{{AdminOrderDetailsInformationSection.customerGroup}}" stepKey="waitForCustomerGroupFieldOnOrderView"/>
57+
<waitForText selector="{{AdminOrderDetailsInformationSection.customerGroup}}" userInput="{{SimpleCatalogPriceRule.customerGroups}}" stepKey="assertCustomerGroupIsNotLoggedIn"/>
58+
</test>
59+
</tests>

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

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="StorefrontGuestCheckoutWithSpecialCityNamesTest">
12+
<annotations>
13+
<features value="Checkout"/>
14+
<stories value="Guest Checkout with Special Characters in City Name"/>
15+
<description value="Verify checkout with special characters in city names"/>
16+
<title value="Verify guest checkout accepts city names with digits, ampersand, period, and parenthesis"/>
17+
<severity value="MINOR"/>
18+
<testCaseId value="AC-15276"/>
19+
<group value="checkout"/>
20+
</annotations>
21+
<before>
22+
<!-- Create simple product for checkout -->
23+
<createData entity="SimpleProduct2" stepKey="createProduct"/>
24+
</before>
25+
<after>
26+
<!-- Delete created product -->
27+
<deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
28+
</after>
29+
<!-- Test 1: City with period - "St. Moritz" -->
30+
<!-- Navigate to StoreFront -->
31+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFront"/>
32+
<!-- Add product to cart -->
33+
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addProductToCartToPlaceOrderWithStMoritzAddress">
34+
<argument name="product" value="$$createProduct$$"/>
35+
</actionGroup>
36+
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="goToCheckoutToPlaceOrderWithStMoritzAddress"/>
37+
<!-- Fill Shipping Address -->
38+
<actionGroup ref="FillGuestCheckoutShippingAddressWithCountryAndStateActionGroup" stepKey="fillShippingFormDataWithStMoritzCity">
39+
<argument name="customer" value="CustomerEntityOne"/>
40+
<argument name="customerAddress" value="CustomerAddressSimple"/>
41+
</actionGroup>
42+
<fillField selector="{{CheckoutShippingSection.city}}" userInput="{{Special_Characters_City.city1}}" stepKey="SetWithStMoritzCity"/>
43+
<!-- Click Next button -->
44+
<actionGroup ref="StorefrontGuestCheckoutProceedToPaymentStepActionGroup" stepKey="clickNextWithCityAsStMoritz"/>
45+
<!-- Place Order -->
46+
<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="guestPlaceOrderWithCityAsStMoritz">
47+
<argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage"/>
48+
<argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
49+
</actionGroup>
50+
51+
<!-- Test 2: City with period - "St. Petersburg" -->
52+
<!-- Add product to cart -->
53+
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addProductToCartToPlaceOrderWithStPetersburgAddress">
54+
<argument name="product" value="$$createProduct$$"/>
55+
</actionGroup>
56+
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="goToCheckoutToPlaceOrderWithStPetersburgAddress"/>
57+
<!-- Fill Shipping Address -->
58+
<actionGroup ref="FillGuestCheckoutShippingAddressWithCountryAndStateActionGroup" stepKey="fillShippingFormDataWithStPetersburgCity">
59+
<argument name="customer" value="CustomerEntityOne"/>
60+
<argument name="customerAddress" value="CustomerAddressSimple"/>
61+
</actionGroup>
62+
<fillField selector="{{CheckoutShippingSection.city}}" userInput="{{Special_Characters_City.city2}}" stepKey="SetWithStPetersburgCity"/>
63+
<!-- Click Next button -->
64+
<actionGroup ref="StorefrontGuestCheckoutProceedToPaymentStepActionGroup" stepKey="clickNextWithCityAsStPetersburg"/>
65+
<!-- Place Order -->
66+
<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="guestPlaceOrderWithCityAsStPetersburg">
67+
<argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage"/>
68+
<argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
69+
</actionGroup>
70+
71+
<!-- Test 3: City with ampersand - "Brighton & Hove" -->
72+
<!-- Add product to cart -->
73+
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addProductToCartToPlaceOrderWithBrightonAndHoveAddress">
74+
<argument name="product" value="$$createProduct$$"/>
75+
</actionGroup>
76+
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="goToCheckoutToPlaceOrderWithBrightonAndHoveAddress"/>
77+
<!-- Fill Shipping Address -->
78+
<actionGroup ref="FillGuestCheckoutShippingAddressWithCountryAndStateActionGroup" stepKey="fillShippingFormDataWithBrightonAndHoveCity">
79+
<argument name="customer" value="CustomerEntityOne"/>
80+
<argument name="customerAddress" value="CustomerAddressSimple"/>
81+
</actionGroup>
82+
<fillField selector="{{CheckoutShippingSection.city}}" userInput="{{Special_Characters_City.city3}}" stepKey="SetWithBrightonAndHoveCity"/>
83+
<!-- Click Next button -->
84+
<actionGroup ref="StorefrontGuestCheckoutProceedToPaymentStepActionGroup" stepKey="clickNextWithCityAsBrightonAndHove"/>
85+
<!-- Place Order -->
86+
<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="guestPlaceOrderWithCityAsBrightonAndHove">
87+
<argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage"/>
88+
<argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
89+
</actionGroup>
90+
91+
<!-- Test 4: City with period - "St. Davids" -->
92+
<!-- Add product to cart -->
93+
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addProductToCartToPlaceOrderWithStDavidAddress">
94+
<argument name="product" value="$$createProduct$$"/>
95+
</actionGroup>
96+
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="goToCheckoutToPlaceOrderWithStDavidAddress"/>
97+
<!-- Fill Shipping Address -->
98+
<actionGroup ref="FillGuestCheckoutShippingAddressWithCountryAndStateActionGroup" stepKey="fillShippingFormDataWithStDavidCity">
99+
<argument name="customer" value="CustomerEntityOne"/>
100+
<argument name="customerAddress" value="CustomerAddressSimple"/>
101+
</actionGroup>
102+
<fillField selector="{{CheckoutShippingSection.city}}" userInput="{{Special_Characters_City.city4}}" stepKey="SetWithStDavidCity"/>
103+
<!-- Click Next button -->
104+
<actionGroup ref="StorefrontGuestCheckoutProceedToPaymentStepActionGroup" stepKey="clickNextWithCityAsStDavid"/>
105+
<!-- Place Order -->
106+
<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="guestPlaceOrderWithCityAsStDavid">
107+
<argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage"/>
108+
<argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
109+
</actionGroup>
110+
111+
<!-- Test 5: City with digits - "29 Palms" -->
112+
<!-- Add product to cart -->
113+
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addProductToCartToPlaceOrderWith29PalmsAddress">
114+
<argument name="product" value="$$createProduct$$"/>
115+
</actionGroup>
116+
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="goToCheckoutToPlaceOrderWith29PalmsAddress"/>
117+
<!-- Fill Shipping Address -->
118+
<actionGroup ref="FillGuestCheckoutShippingAddressWithCountryAndStateActionGroup" stepKey="fillShippingFormDataWith29PalmsCity">
119+
<argument name="customer" value="CustomerEntityOne"/>
120+
<argument name="customerAddress" value="CustomerAddressSimple"/>
121+
</actionGroup>
122+
<fillField selector="{{CheckoutShippingSection.city}}" userInput="{{Special_Characters_City.city5}}" stepKey="SetWith29PalmsCity"/>
123+
<!-- Click Next button -->
124+
<actionGroup ref="StorefrontGuestCheckoutProceedToPaymentStepActionGroup" stepKey="clickNextWithCityAs29Palms"/>
125+
<!-- Place Order -->
126+
<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="guestPlaceOrderWithCityAs29Palms">
127+
<argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage"/>
128+
<argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
129+
</actionGroup>
130+
131+
<!-- Test 6: City with parenthesis - "Anywhere (North)" -->
132+
<!-- Add product to cart -->
133+
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addProductToCartToPlaceOrderWithNorthAmericaPartAddress">
134+
<argument name="product" value="$$createProduct$$"/>
135+
</actionGroup>
136+
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="goToCheckoutToPlaceOrderWithNorthAmericaPartAddress"/>
137+
<!-- Fill Shipping Address -->
138+
<actionGroup ref="FillGuestCheckoutShippingAddressWithCountryAndStateActionGroup" stepKey="fillShippingFormDataWithNorthAmericaPartCity">
139+
<argument name="customer" value="CustomerEntityOne"/>
140+
<argument name="customerAddress" value="CustomerAddressSimple"/>
141+
</actionGroup>
142+
<fillField selector="{{CheckoutShippingSection.city}}" userInput="{{Special_Characters_City.city6}}" stepKey="SetWithNorthAmericaPartCity"/>
143+
<!-- Click Next button -->
144+
<actionGroup ref="StorefrontGuestCheckoutProceedToPaymentStepActionGroup" stepKey="clickNextWithCityAsNorthAmericaPart"/>
145+
<!-- Place Order -->
146+
<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="guestPlaceOrderWithCityAsNorthAmericaPart">
147+
<argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage"/>
148+
<argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
149+
</actionGroup>
150+
</test>
151+
</tests>

0 commit comments

Comments
 (0)