Skip to content

Commit 842a7c7

Browse files
Karishmathakare19Karishmathakare19
authored
Merge pull request #10232 from magento-gl/ACQE-functional-deployment-v4-6
Bengals Functional Mainline deployment PR
2 parents 913bf1a + bb3ce57 commit 842a7c7

19 files changed

+476
-52
lines changed

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

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<testCaseId value="MC-14704"/>
1717
<group value="mtf_migrated"/>
1818
</annotations>
19-
2019
<before>
2120
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>
2221
<magentoCLI command="config:set {{DisableGuestCheckoutConfigData.path}} {{DisableGuestCheckoutConfigData.value}}" stepKey="disableGuestCheckout"/>
@@ -29,48 +28,42 @@
2928
<after>
3029
<magentoCLI command="config:set {{EnableGuestCheckoutConfigData.path}} {{EnableGuestCheckoutConfigData.value}}" stepKey="enableGuestCheckout"/>
3130
<magentoCLI command="config:set {{EnableCustomerRedirectToDashboardConfigData.path}} {{EnableCustomerRedirectToDashboardConfigData.value}}" stepKey="enableCustomerRedirect"/>
32-
3331
<!-- Sign out Customer from storefront -->
3432
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openHomePage"/>
3533
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
3634
<deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
3735
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
36+
<!--Delete created customer on storefront-->
37+
<actionGroup ref="AdminDeleteAllCustomerActionGroup" stepKey="deleteAllCustomers"/>
3838
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3939
</after>
40-
4140
<!--Open Product page in StoreFront and assert product and price range -->
4241
<actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKeyActionGroup" stepKey="openProductPageAndVerifyProduct">
4342
<argument name="product" value="$$simpleProduct$$"/>
4443
</actionGroup>
45-
4644
<!--Add product to the cart -->
4745
<actionGroup ref="StorefrontAddProductToCartWithQtyActionGroup" stepKey="addProductToTheCart">
4846
<argument name="productQty" value="1"/>
4947
</actionGroup>
50-
5148
<!--Open View and edit -->
5249
<actionGroup ref="ClickViewAndEditCartFromMiniCartActionGroup" stepKey="clickMiniCart"/>
5350
<actionGroup ref="StorefrontClickProceedToCheckoutActionGroup" stepKey="goToCheckout"/>
5451
<comment userInput="Adding the comment to replace waitForPageToLoad action for preserving Backward Compatibility" stepKey="waitForPageToLoad"/>
55-
5652
<!--Create an account-->
5753
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.createAnAccount}}" stepKey="waitForElementToBeVisible"/>
5854
<click selector="{{StorefrontCustomerSignInPopupFormSection.createAnAccount}}" stepKey="clickOnCreateAnAccountButton"/>
5955
<waitForPageLoad stepKey="waitForCreateAccountPageToLoad"/>
60-
6156
<!--Fill the registration form -->
6257
<actionGroup ref="StorefrontFillCustomerAccountCreationFormActionGroup" stepKey="createNewCustomerAccount">
6358
<argument name="customer" value="Simple_US_Customer" />
6459
</actionGroup>
6560
<actionGroup ref="StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup" stepKey="clickCreateAccountButton"/>
6661
<comment userInput="BIC workaround" stepKey="waitForCreateAccountButtonToLoad"/>
67-
6862
<!--Assert customer information-->
6963
<see stepKey="seeThankYouMessage" userInput="Thank you for registering with Main Website Store."/>
7064
<see stepKey="seeFirstName" userInput="{{Simple_US_Customer.firstname}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
7165
<see stepKey="seeLastName" userInput="{{Simple_US_Customer.lastname}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
7266
<see stepKey="seeEmail" userInput="{{Simple_US_Customer.email}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
73-
7467
<!--Fill Address details -->
7568
<click selector="{{CheckoutPaymentSection.addressBook}}" stepKey="goToAddressBook"/>
7669
<fillField stepKey="fillPhoneNumber" userInput="{{US_Address_TX.telephone}}" selector="{{StorefrontCustomerAddressFormSection.phoneNumber}}"/>
@@ -81,50 +74,40 @@
8174
<selectOption stepKey="selectCountryForAddress" userInput="{{US_Address_TX.country}}" selector="{{StorefrontCustomerAddressFormSection.country}}"/>
8275
<click stepKey="saveCustomerAddress" selector="{{StorefrontCustomerAddressFormSection.saveAddress}}"/>
8376
<see userInput="You saved the address." stepKey="verifyAddressAdded"/>
84-
8577
<!-- Open Edit and View from cart -->
8678
<actionGroup ref="ClickViewAndEditCartFromMiniCartActionGroup" stepKey="openViewAndEditOption"/>
87-
8879
<!-- Proceed to checkout -->
8980
<actionGroup ref="StorefrontClickProceedToCheckoutActionGroup" stepKey="goToCheckout1"/>
9081
<actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickOnNextButton"/>
91-
9282
<!-- Verify order summary on payment page -->
9383
<actionGroup ref="VerifyCheckoutPaymentOrderSummaryActionGroup" stepKey="verifyCheckoutPaymentOrderSummary">
9484
<argument name="orderSummarySubTotal" value="$50.00"/>
9585
<argument name="orderSummaryShippingTotal" value="$5.00"/>
9686
<argument name="orderSummaryTotal" value="$55.00"/>
9787
</actionGroup>
98-
9988
<!-- Assert Shipping Address -->
10089
<actionGroup ref="CheckShipToInformationInCheckoutActionGroup" stepKey="assertShippingAddressDetails">
10190
<argument name="customerVar" value="Simple_US_Customer"/>
10291
<argument name="customerAddressVar" value="US_Address_TX"/>
10392
</actionGroup>
104-
10593
<!-- Assert Billing Address -->
10694
<actionGroup ref="CheckBillingAddressInCheckoutActionGroup" stepKey="assertBillingAddressDetails">
10795
<argument name="customerVar" value="Simple_US_Customer"/>
10896
<argument name="customerAddressVar" value="US_Address_TX"/>
10997
</actionGroup>
11098
<see userInput="Flat Rate - Fixed" selector="{{CheckoutPaymentSection.shippingMethodInformation}}" stepKey="assertShippingMethodInformation"/>
111-
11299
<!-- Place order and Assert success message -->
113100
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder"/>
114101
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
115102
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="orderId"/>
116-
117103
<!-- Open Order Index Page -->
118104
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
119-
120105
<!-- Filter Order using orderId and assert order-->
121106
<actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
122107
<argument name="orderId" value="$orderId"/>
123108
</actionGroup>
124-
125109
<click selector="{{AdminOrdersGridSection.viewLink('$orderId')}}" stepKey="clickOnViewLink"/>
126110
<waitForPageLoad stepKey="waitForOrderPageToLoad"/>
127-
128111
<!-- Ship the order and assert the shipping status -->
129112
<actionGroup ref="AdminShipThePendingOrderActionGroup" stepKey="shipTheOrder"/>
130113
</test>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@
1919
</annotations>
2020

2121
<before>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
23+
<actionGroup ref="AdminDeleteAllCustomerActionGroup" stepKey="deleteAllCustomerFromGrid"/>
2224
<createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="createCustomer"/>
2325
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
2426
<argument name="indices" value=""/>
2527
</actionGroup>
26-
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2728
</before>
2829
<after>
2930
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
<after>
2929
<!--Delete customer-->
3030
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
31+
<!--Delete created customer while generating Order-->
32+
<actionGroup ref="AdminDeleteAllCustomerActionGroup" stepKey="deleteAllCustomers"/>
3133
<!--Delete product-->
3234
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
3335
<!--Logout as Admin-->

‎app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminCreateGroupedProductWithUkTaxDisplayTest.xml‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
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="AdminCreateGroupedProductWithUkTaxDisplayTest">
12+
<annotations>
13+
<features value="GroupedProduct"/>
14+
<stories value="Admin configures UK tax for grouped products"/>
15+
<title value="Create Grouped product with UK 20% tax"/>
16+
<description value="Creates grouped product, configures UK tax, enables inclusive/exclusive price display, verifies storefront visibility."/>
17+
<severity value="AVERAGE"/>
18+
<testCaseId value="AC-6363"/>
19+
<group value="GroupedProduct"/>
20+
<group value="tax"/>
21+
</annotations>
22+
<before>
23+
<createData entity="_defaultCategory" stepKey="createCategory"/>
24+
<createData entity="ApiSimpleProduct" stepKey="createSimpleOne">
25+
<requiredEntity createDataKey="createCategory"/>
26+
<field key="price">100.00</field>
27+
</createData>
28+
<createData entity="ApiSimpleProduct" stepKey="createSimpleTwo">
29+
<requiredEntity createDataKey="createCategory"/>
30+
<field key="price">150.00</field>
31+
</createData>
32+
<!-- Step 1: Login as admin -->
33+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
34+
<!-- Step 3: Create tax zone (add a new tax zone for the UK, all regions and zip codes, at a rate of 20%. ) -->
35+
<createData entity="taxRateCustomRateUK" stepKey="createUkTaxRate">
36+
<field key="rate">20.0000</field>
37+
<field key="zip_is_range">0</field>
38+
<field key="tax_postcode">*</field>
39+
<field key="tax_region_id">0</field>
40+
</createData>
41+
<!-- Step 4: Create tax rule and assign UK. -->
42+
<actionGroup ref="AdminCreateTaxRuleActionGroup" stepKey="createUkTaxRule">
43+
<argument name="taxRate" value="$$createUkTaxRate$$"/>
44+
<argument name="taxRule" value="SimpleTaxRule"/>
45+
</actionGroup>
46+
<!-- Step 5: Set both options to "Including and Excluding Tax" under Store > Configuration > Sales > Tax > Price Display Settings -->
47+
<magentoCLI command="config:set {{CustomDisplayProductPricesInCatalog.path}} {{CustomDisplayProductPricesInCatalog.value}}" stepKey="setCatalogDisplayBoth"/>
48+
<magentoCLI command="config:set {{CustomDisplayShippingPricesInCatalog.path}} {{CustomDisplayShippingPricesInCatalog.value}}" stepKey="setCatalogShippingBoth"/>
49+
<magentoCLI command="config:set {{CustomCartDisplayPrice.path}} {{CustomCartDisplayPrice.value}}" stepKey="setCartPriceBoth"/>
50+
<magentoCLI command="config:set {{CustomCartDisplaySubtotal.path}} {{CustomCartDisplaySubtotal.value}}" stepKey="setCartSubtotalBoth"/>
51+
<magentoCLI command="config:set {{CustomCartDisplayShipping.path}} {{CustomCartDisplayShipping.value}}" stepKey="setCartShippingBoth"/>
52+
</before>
53+
<after>
54+
<magentoCLI command="config:set {{DisplayProductPricesInCatalog.path}} {{DisplayProductPricesInCatalog.value}}" stepKey="resetCatalogDisplay"/>
55+
<magentoCLI command="config:set {{DefaultDisplayShippingPricesInCatalog.path}} {{DefaultDisplayShippingPricesInCatalog.value}}" stepKey="resetCatalogShipping"/>
56+
<magentoCLI command="config:set {{DefaultCartDisplayPrice.path}} {{DefaultCartDisplayPrice.value}}" stepKey="resetCartPrice"/>
57+
<magentoCLI command="config:set {{DefaultCartDisplaySubtotal.path}} {{DefaultCartDisplaySubtotal.value}}" stepKey="resetCartSubtotal"/>
58+
<magentoCLI command="config:set {{DisplayShippingAmountConfigData.path}} {{DisplayShippingAmountConfigData.value}}" stepKey="resetCartShipping"/>
59+
<actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="openTaxRuleGrid"/>
60+
<actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteUkTaxRule">
61+
<argument name="name" value="{{SimpleTaxRule.code}}"/>
62+
<argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
63+
</actionGroup>
64+
<deleteData createDataKey="createUkTaxRate" stepKey="deleteUkTaxRate"/>
65+
<helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteProducts"/>
66+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
67+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAdmin"/>
68+
</after>
69+
<!-- Step 2: Create grouped product and assign simple products -->
70+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="openProductGrid"/>
71+
<actionGroup ref="GoToCreateProductPageActionGroup" stepKey="startGroupedProductCreation">
72+
<argument name="product" value="GroupedProduct"/>
73+
</actionGroup>
74+
<waitForElementVisible selector="{{AdminProductFormSection.productName}}" stepKey="waitForGroupedForm"/>
75+
<actionGroup ref="FillGroupedProductFormActionGroup" stepKey="fillGroupedBasics">
76+
<argument name="product" value="GroupedProduct"/>
77+
</actionGroup>
78+
<waitForElementClickable selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="waitForCategoryDropdown"/>
79+
<click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="openCategoryDropdown"/>
80+
<actionGroup ref="SetCategoryByNameActionGroup" stepKey="addCategoryToGroupedProduct">
81+
<argument name="categoryName" value="$$createCategory.name$$"/>
82+
</actionGroup>
83+
<conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" visible="false" stepKey="openGroupedSection"/>
84+
<click selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="openAddProductsModal"/>
85+
<waitForElementVisible selector="{{AdminAddProductsToGroupPanel.filters}}" stepKey="waitForProductsModal"/>
86+
<actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterFirstSimple">
87+
<argument name="sku" value="$$createSimpleOne.sku$$"/>
88+
</actionGroup>
89+
<checkOption selector="{{AdminAddProductsToGroupPanel.nThCheckbox('0')}}" stepKey="selectFirstSimple"/>
90+
<actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterSecondSimple">
91+
<argument name="sku" value="$$createSimpleTwo.sku$$"/>
92+
</actionGroup>
93+
<checkOption selector="{{AdminAddProductsToGroupPanel.nThCheckbox('0')}}" stepKey="selectSecondSimple"/>
94+
<click selector="{{AdminAddProductsToGroupPanel.addSelectedProducts}}" stepKey="addSelectedProducts"/>
95+
<actionGroup ref="FillDefaultQuantityForLinkedToGroupProductInGridActionGroup" stepKey="setQtySimpleOne">
96+
<argument name="productName" value="$$createSimpleOne.name$$"/>
97+
<argument name="qty" value="1"/>
98+
</actionGroup>
99+
<actionGroup ref="FillDefaultQuantityForLinkedToGroupProductInGridActionGroup" stepKey="setQtySimpleTwo">
100+
<argument name="productName" value="$$createSimpleTwo.name$$"/>
101+
<argument name="qty" value="1"/>
102+
</actionGroup>
103+
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveGroupedProduct"/>
104+
<!-- Step 7: Navigate to the category the grouped product belongs to on frontend -->
105+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStorefrontHome"/>
106+
<actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategory">
107+
<argument name="categoryName" value="$$createCategory.name$$"/>
108+
</actionGroup>
109+
<waitForText selector="{{StorefrontCategoryProductSection.ProductTitleByName(GroupedProduct.name)}}" userInput="{{GroupedProduct.name}}" stepKey="seeGroupedProductInCategory"/>
110+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openGroupedProductPdp">
111+
<argument name="productUrl" value="{{GroupedProduct.urlKey}}"/>
112+
</actionGroup>
113+
<waitForElementVisible selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="waitForPdpLoad"/>
114+
<waitForText selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{GroupedProduct.name}}" stepKey="confirmPdpName"/>
115+
</test>
116+
</tests>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,7 @@
1414
<element name="shippingMethod" type="radio" selector="//div[@class='block block-shipping'][position()={{shippingBlockPosition}}]//dd[position()={{shippingMethodPosition}}]" parameterized="true" timeout="5"/>
1515
<element name="goToBillingInfo" type="button" selector=".action.primary.continue"/>
1616
<element name="productDetails" type="text" selector="//a[text()='{{var1}}']/../../..//td[@class='col qty' and text()='{{var2}}']" parameterized="true"/>
17+
<element name="firstShippingMethodForCity" type="radio" selector="//form[contains(@id, 'shipping_method_form')]//address[contains(., '{{city}}')]/ancestor::div[contains(@class, 'block-content')]//div[contains(@class, 'box-shipping-method')]//input[@type='radio'][1]" parameterized="true" timeout="30"/>
18+
<element name="shippingMethodBoxForCity" type="block" selector="//form[contains(@id, 'shipping_method_form')]//address[contains(., '{{city}}')]/ancestor::div[contains(@class, 'block-content')]//div[contains(@class, 'box-shipping-method')]" parameterized="true" timeout="30"/>
1719
</section>
1820
</sections>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="StorefrontMultishippingCheckoutOverviewReviewSection">
1212
<element name="placeOrder" type="button" selector="button.action.primary.submit"/>
13+
<element name="shippingMethodForCity" type="block" selector="//form[contains(@id, 'review-order-form')]//address[contains(., '{{city}}')]/ancestor::div[contains(@class, 'block-content')]//div[contains(@class, 'box-shipping-method')]" parameterized="true" timeout="30"/>
1314
</section>
1415
</sections>

0 commit comments

Comments
 (0)