Skip to content

Commit e6fb79d

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' into 2.4.8-beta2-develop-sync
2 parents 5d42fc0 + 0057e06 commit e6fb79d

8 files changed

+63
-18
lines changed

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

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

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -82,6 +82,7 @@
8282
<argument name="discountCode" value="{{CatPriceRule.coupon_code}}"/>
8383
</actionGroup>
8484
<!-- Assert order cannot be placed and error message will shown. -->
85+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectDefaultPaymentMethod"/>
8586
<actionGroup ref="AssertStorefrontOrderIsNotPlacedActionGroup" stepKey="seeShippingMethodError">
8687
<argument name="error" value="The shipping method is missing. Select the shipping method and try again."/>
8788
</actionGroup>

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

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

@@ -65,6 +65,7 @@
6565
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext"/>
6666
<waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
6767
<seeCurrentUrlMatches regex="~/checkout/?#payment~" stepKey="assertCheckoutPaymentUrl"/>
68+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectDefaultPaymentMethod"/>
6869
<waitForElementVisible selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
6970
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
7071
<seeElement selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="seeOrderNumber"/>

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerConfigSection.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
8-
98
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
109
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1110
<section name="AdminCustomerConfigSection">
@@ -14,5 +13,8 @@
1413
<element name="enableExtensionLabel" type="text" selector="//span[contains(text(),'Enable Extension') and contains(@data-config-scope,'[GLOBAL]')]" timeout="30"/>
1514
<element name="disablePageCacheLabel" type="text" selector="//span[contains(text(),'Disable Page Cache For Admin User') and contains(@data-config-scope,'[GLOBAL]')]" timeout="30"/>
1615
<element name="storeViewToLoginToLabel" type="text" selector="//span[contains(text(),'Store To Login To') and contains(@data-config-scope,'[GLOBAL]')]" timeout="30"/>
16+
<element name="TitleForLoginAsCustomer" type="text" selector="//span[normalize-space()='{{option}}']" parameterized="true"/>
17+
<element name="LoginAsCustomerOptInCheckboxTextField" type="text" selector="//tr[@id='row_login_as_customer_general_shopping_assistance_checkbox_title']//td[@class='value']"/>
18+
<element name="LoginAsCustomerCheckboxToolTipTextField" type="text" selector="//tr[@id='row_login_as_customer_general_shopping_assistance_checkbox_tooltip']//td[@class='value']"/>
1719
</section>
1820
</sections>

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerOptInCheckboxNotTranslatableTest.xml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
<tests
9+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminLoginAsCustomerOptInCheckboxNotTranslatableTest">
12+
<annotations>
13+
<title value="Admin Login as Customer opt-in checkbox not translatable"/>
14+
<description value="Verify Admin Login as Customer opt-in checkbox not translatable"/>
15+
<features value="Login as Customer"/>
16+
<severity value="AVERAGE"/>
17+
<testCaseId value="AC-13001"/>
18+
<stories value="Login as Customer opt-in checkbox not translatable"/>
19+
<group value="login_as_customer"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23+
</before>
24+
<after>
25+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
26+
</after>
27+
<amOnPage url="{{AdminLoginAsCustomerConfigPage.url}}" stepKey="navigateToLoginAsCustomerConfigSection"/>
28+
<!--Look for fields "Title for Login as Customer opt-in checkbox" and "Login as Customer checkbox tooltip"-->
29+
<waitForElementVisible selector="{{AdminCustomerConfigSection.TitleForLoginAsCustomer('Title for Login as Customer opt-in checkbox')}}" stepKey="TitleForLoginAsCustomerOptInCheckbox"/>
30+
<waitForElementVisible selector="{{AdminCustomerConfigSection.LoginAsCustomerOptInCheckboxTextField}}" stepKey="LoginAsCustomerOptInCheckboxTextField"/>
31+
<waitForElementVisible selector="{{AdminCustomerConfigSection.TitleForLoginAsCustomer('Login as Customer checkbox tooltip')}}" stepKey="TitleForLoginAsCustomerCheckboxToolTip"/>
32+
<waitForElementVisible selector="{{AdminCustomerConfigSection.LoginAsCustomerCheckboxToolTipTextField}}" stepKey="LoginAsCustomerCheckboxToolTipTextField"/>
33+
<!--Switch to Default Store view-->
34+
<actionGroup ref="SwitchToTheNewStoreViewActionGroup" stepKey="selectDefaultStoreView">
35+
<argument name="storeViewName" value="Default Store View"/>
36+
</actionGroup>
37+
<!--Look for fields "Title for Login as Customer opt-in checkbox" and "Login as Customer checkbox tooltip"-->
38+
<waitForElementVisible selector="{{AdminCustomerConfigSection.TitleForLoginAsCustomer('Title for Login as Customer opt-in checkbox')}}" stepKey="TitleForLoginAsCustomerOptInCheckboxInDefaultStoreView"/>
39+
<waitForElementVisible selector="{{AdminCustomerConfigSection.LoginAsCustomerOptInCheckboxTextField}}" stepKey="LoginAsCustomerOptInCheckboxTextFieldInDefaultStoreView"/>
40+
<waitForElementVisible selector="{{AdminCustomerConfigSection.TitleForLoginAsCustomer('Login as Customer checkbox tooltip')}}" stepKey="TitleForLoginAsCustomerCheckboxToolTipInDefaultStoreView"/>
41+
<waitForElementVisible selector="{{AdminCustomerConfigSection.LoginAsCustomerCheckboxToolTipTextField}}" stepKey="LoginAsCustomerCheckboxToolTipTextFieldInDefaultStoreView"/>
42+
</test>
43+
</tests>

‎app/code/Magento/Paypal/Test/Mftf/Test/AdminCheckoutUsingPaypalInContextWithDifferentCurrenciesTest.xml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -95,11 +95,10 @@
9595
<actionGroup ref="StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup" stepKey="loginToPayPal"/>
9696
<actionGroup ref="StorefrontPaypalSwitchBackToMagentoFromCheckoutPageActionGroup" stepKey="confirmPaymentAndGoBackToMagento"/>
9797
<waitForElementVisible selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="waitForOrderNumberToBeGrabbed"/>
98-
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
99-
<!-- Navigate to Sales order page -->
100-
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="navigateToSalesOrderPage"/>
101-
<!-- Open created order -->
102-
<actionGroup ref="AdminOpenOrderByEntityIdActionGroup" stepKey="filterOrdersGridById">
98+
<actionGroup ref="StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup" stepKey="openOrderViewPage"/>
99+
<grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderNumber"/>
100+
<!--Step11. Go to admin Order page for newly created order-->
101+
<actionGroup ref="AdminOpenOrderByEntityIdActionGroup" stepKey="navigateToSalesOrderPage">
103102
<argument name="entityId" value="{$grabOrderNumber}"/>
104103
</actionGroup>
105104
<!--Verify Success Message-->

‎app/code/Magento/Reports/Test/Mftf/Test/AdminCanceledOrdersInOrderSalesReportTest.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
<testCaseId value="MAGETWO-95960"/>
2020
<useCaseId value="MAGETWO-95823"/>
2121
<group value="cloud"/>
22-
<!--Will be fixed in the scope of ACQE-7552 -->
23-
<group value="pr_exclude"/>
2422
</annotations>
2523

2624
<before>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminVerifyCreditMemoForFreeShippingTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
<argument name="shippingMethodName" value="Free Shipping"/>
6363
</actionGroup>
6464
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext"/>
65+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectDefaultPaymentMethod"/>
6566
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
6667
<!-- I see order successful Page -->
6768
<actionGroup ref="AssertStorefrontCheckoutSuccessActionGroup" stepKey="assertOrderSuccess"/>

0 commit comments

Comments
 (0)