Skip to content

Commit f5c335d

Browse files
internal-magento-queue-manager[bot]internal-magento-queue-manager[bot]
authored
Merge pull request #9914 from magento-gl/ACQE-functional-deployment-v7
Bengals Functional Mainline deployment PR
2 parents b1b5e0c + ebe2ebc commit f5c335d

17 files changed

+346
-26
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontPlaceOrderBundleProductFixedPriceWithUpdatedPriceTest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@
114114
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="openCheckoutPage"/>
115115
<!--Click next button to open payment section-->
116116
<actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
117+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder"/>
117118
<!--Click place order-->
118119
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="placeOrder"/>
119120
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="orderNumber"/>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1604,4 +1604,8 @@
16041604
<requiredEntity type="product_option">ProductOptionField20</requiredEntity>
16051605
<requiredEntity type="product_option">ProductOptionField21</requiredEntity>
16061606
</entity>
1607+
<entity name="productWithCheckboxCustomOptions" type="product">
1608+
<var key="sku" entityType="product" entityKey="sku"/>
1609+
<requiredEntity type="product_option">ProductOptionCheckboxFor2</requiredEntity>
1610+
</entity>
16071611
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductFormData.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@
1212
<data key="remove_image_notice">The image cannot be removed as it has been assigned to the other image role</data>
1313
<data key="save_success">You saved the product.</data>
1414
</entity>
15+
<entity name="ProductWarningMessage" type="message">
16+
<data key="require_Message">This is a required field.</data>
17+
</entity>
1518
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,4 +447,7 @@
447447
<requiredEntity type="product_option_value">ProductValueCheckbox1</requiredEntity>
448448
<requiredEntity type="product_option_value">ProductValueCheckbox2</requiredEntity>
449449
</entity>
450+
<entity name="ProductRadioButtonType" type="product_option">
451+
<data key="type">Radio Buttons</data>
452+
</entity>
450453
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontVerifyProductReorderWithCustomOptionTest.xml‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
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="StorefrontVerifyProductReorderWithCustomOptionTest">
12+
<annotations>
13+
<features value="Catalog"/>
14+
<stories value="Reorder product with custom option"/>
15+
<title value="Customer should be able to reorder product with a selected custom checkbox option"/>
16+
<description value="Verifies that a customer can reorder a product where one custom checkbox option was selected during the original purchase."/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="AC-13538"/>
19+
<group value="Catalog"/>
20+
</annotations>
21+
<before>
22+
<!-- Precondition: Create customer -->
23+
<createData entity="Simple_US_Customer_NY" stepKey="createCustomer"/>
24+
<!-- Step1&2&3: Create product with checkbox two custom options -->
25+
<createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
26+
<updateData entity="productWithCheckboxCustomOptions" createDataKey="createSimpleProduct" stepKey="addCustomOptions">
27+
<requiredEntity createDataKey="createSimpleProduct"/>
28+
</updateData>
29+
</before>
30+
<after>
31+
<!-- Customer logout -->
32+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
33+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
34+
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
35+
</after>
36+
<!-- Step4: Login as a customer -->
37+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
38+
<argument name="Customer" value="$createCustomer$"/>
39+
</actionGroup>
40+
<!-- Step5: Open Product Page-->
41+
<actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="openProductPage">
42+
<argument name="product" value="$createSimpleProduct$"/>
43+
</actionGroup>
44+
<!-- Add Product to Cart from product detail page -->
45+
<click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart"/>
46+
<!-- see custom option validation message -->
47+
<waitForText userInput="{{ProductWarningMessage.require_Message}}" stepKey="seeRequiredField"/>
48+
<!-- Choose checkbox value1 -->
49+
<actionGroup ref="StorefrontAddSimpleProductCustomOptionCheckBoxActionGroup" stepKey="selectCustomOptionCheckBoxForValue1"/>
50+
<!-- Step6: place order -->
51+
<actionGroup ref="StorefrontProductPageAddSimpleProductToCartActionGroup" stepKey="addSimpleProductToCart"/>
52+
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="clickToProceedToCheckout"/>
53+
<actionGroup ref="StorefrontSetShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
54+
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNextOnShippingStep"/>
55+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder"/>
56+
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrder"/>
57+
<!-- Step7: Go to order page -->
58+
<actionGroup ref="StorefrontOpenMyAccountPageActionGroup" stepKey="goToMyAccountPage"/>
59+
<actionGroup ref="StorefrontCustomerGoToSidebarMenu" stepKey="goToSidebarMenu">
60+
<argument name="menu" value="{{sidebarTabMenu.my_orders}}"/>
61+
</actionGroup>
62+
<!-- Clicking View Order from My Orders Grid -->
63+
<actionGroup ref="StorefrontClickViewOrderLinkOnMyOrdersPageActionGroup" stepKey="clickViewOrder"/>
64+
<!-- Clicking on Reorder link from Order Details Tab -->
65+
<waitForElementClickable selector="{{StorefrontCustomerOrderViewSection.reorder}}" stepKey="waitForReorderButtonToBeClickable"/>
66+
<click selector="{{StorefrontCustomerOrderViewSection.reorder}}" stepKey="clickReorder"/>
67+
<actionGroup ref="StorefrontCheckoutCheckProductActionGroup" stepKey="checkProduct">
68+
<argument name="product" value="$$createSimpleProduct$$"/>
69+
<argument name="cartItem" value="SimpleCartItem"/>
70+
</actionGroup>
71+
</test>
72+
</tests>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="UkCustomerTaxClass" type="customerGroup">
12+
<data key="taxClassName" unique="suffix">UkCustomer-</data>
13+
</entity>
14+
</entities>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="sidebarTabMenu">
12+
<data key="my_orders">My Orders</data>
13+
</entity>
14+
</entities>

‎app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml‎

Lines changed: 7 additions & 7 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 2018 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -51,7 +51,7 @@
5151
<argument name="taxCode" value="SimpleTaxUKZeroRate"/>
5252
</actionGroup>
5353
<actionGroup ref="AddCustomerTaxClassActionGroup" stepKey="addCustomerTaxClass">
54-
<argument name="customerTaxClassName" value="UK_zero"/>
54+
<argument name="customerTaxClassName" value="{{UkCustomerTaxClass.taxClassName}}"/>
5555
</actionGroup>
5656
<click stepKey="disableDefaultProdTaxClass" selector="{{AdminTaxRulesSection.defaultCustomerTaxClass}}"/>
5757
<wait stepKey="waitForDisableDefaultProdTaxClass" time="2"/>
@@ -61,7 +61,7 @@
6161
<!--Create a Customer Group (CUSTOMERS > Customer Groups)-->
6262
<actionGroup ref="AdminCreateCustomerGroupActionGroup" stepKey="createCustomerGroup">
6363
<argument name="groupName" value="test_UK"/>
64-
<argument name="taxClass" value="UK_zero"/>
64+
<argument name="taxClass" value="{{UkCustomerTaxClass.taxClassName}}"/>
6565
</actionGroup>
6666

6767
<!--Set Customer Create New Account Options Config-->
@@ -137,7 +137,7 @@
137137
<deleteData createDataKey="createCategory" stepKey="deleteCategoryFirst"/>
138138

139139
<actionGroup ref="DeleteProductTaxClassActionGroup" stepKey="deleteFirstProductTaxClass">
140-
<argument name="taxClassName" value="UK_zero"/>
140+
<argument name="taxClassName" value="{{UkCustomerTaxClass.taxClassName}}"/>
141141
</actionGroup>
142142

143143
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />

‎app/code/Magento/GiftMessage/Test/Mftf/Test/StorefrontGiftMessageForOrderOnCheckoutCartPageTest.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 2021 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -17,6 +17,7 @@
1717
<group value="pr_exclude"/>
1818
</annotations>
1919
<before>
20+
<magentoCLI command="config:set sales/gift_options/allow_items 0" stepKey="disableGiftMessagesForOrderItems"/>
2021
<magentoCLI command="config:set sales/gift_options/allow_order 1" stepKey="enableGiftMessageForOrder"/>
2122
<createData entity="SimpleProduct2" stepKey="simpleProduct"/>
2223
</before>

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

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
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"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminRegisteredCustomerCheckoutUsingPayPalExpressCheckoutTest">
11+
<annotations>
12+
<features value="PayPal"/>
13+
<stories value="Registered Customers Paypal express checkout configuration"/>
14+
<title value="Registered Customers uses Paypal Express Checkout configuration with valid credentials"/>
15+
<description value="As a registered customer I want to be able to buy goods using PayPal express with Flat rate Shipping"/>
16+
<severity value="CRITICAL"/>
17+
<testCaseId value="AC-5246"/>
18+
<group value="3rd_party_integration"/>
19+
<group value="paypalExpress"/>
20+
<group value="pr_exclude"/>
21+
</annotations>
22+
<before>
23+
<!-- Precondition1: create Simple product -->
24+
<createData entity="simpleProductWithoutCategory" stepKey="createProduct">
25+
<field key="price">10.00</field>
26+
</createData>
27+
<!-- Precondition2: create customer -->
28+
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
29+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
30+
</before>
31+
<after>
32+
<!-- delete created data -->
33+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
34+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
35+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
36+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
37+
</after>
38+
<!-- Step1: Login to storefront as a customer -->
39+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
40+
<argument name="Customer" value="$$createCustomer$$"/>
41+
</actionGroup>
42+
<!-- Step2: Add product to cart and got to checkout page -->
43+
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addProductToCart">
44+
<argument name="product" value="$$createProduct$$"/>
45+
</actionGroup>
46+
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="goToCheckout"/>
47+
<actionGroup ref="StorefrontSetShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
48+
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNextOnShippingStep"/>
49+
<!-- Step3&4&5: Checkout with PayPal -->
50+
<waitForElementClickable selector="{{CheckoutPaymentSection.PayPalPaymentRadio}}" stepKey="waitForPayPalRadioButton"/>
51+
<click selector="{{CheckoutPaymentSection.PayPalPaymentRadio}}" stepKey="selectPaypalPayment"/>
52+
<actionGroup ref="SwitchToPayPalGroupBtnActionGroup" stepKey="clickPayPalBtn"/>
53+
<!-- Login to PayPal in-context and verify order total on PayPal page-->
54+
<actionGroup ref="StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup" stepKey="loginToPayPal"/>
55+
<actionGroup ref="StorefrontPaypalSwitchBackToMagentoFromCheckoutPageActionGroup" stepKey="confirmPaymentAndGoBackToMagento"/>
56+
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
57+
<waitForText selector="{{CheckoutSuccessMainSection.success}}" userInput="{{CONST.successCheckoutEmailYouMessage}}" stepKey="seeSuccessMessage"/>
58+
<!-- Step6&7: Open order and verify amounts -->
59+
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="openFirstOrderPage">
60+
<argument name="orderId" value="{$grabOrderNumber}"/>
61+
</actionGroup>
62+
<actionGroup ref="AdminOrderViewCheckStatusActionGroup" stepKey="seeAdminOrderStatus">
63+
<argument name="status" value="{{OrderState.processing}}"/>
64+
</actionGroup>
65+
<waitForText selector="{{AdminOrderTotalSection.grandTotal}}" userInput="$15.00" stepKey="checkGrandTotal"/>
66+
<actionGroup ref="AdminOpenOrderCommentsHistoryActionGroup" stepKey="clickOnCommentsHistory"/>
67+
<waitForText selector="{{AdminOrderCommentsTabSection.orderComment}}" userInput="Authorized amount of $15.00." stepKey="seeOrderHistoryNotes"/>
68+
<!--Open invoice tab and verify the invoice is present-->
69+
<waitForElementClickable selector="{{AdminOrderDetailsOrderViewSection.invoices}}" stepKey="waitForInvoicesTabToBeClickable"/>
70+
<click selector="{{AdminOrderDetailsOrderViewSection.invoices}}" stepKey="clickOrderInvoicesTab"/>
71+
<waitForPageLoad stepKey="waitForInvoiceGridLoadingMask"/>
72+
<waitForText selector="{{AdminOrderDetailsMainActionsSection.invoiceTabContent1}}" userInput="{{InvoiceTabErrorMessage.error_Message}}" stepKey="verifyThereIsNoInvoiceCreated"/>
73+
</test>
74+
</tests>

0 commit comments

Comments
 (0)