Merge pull request #10103 from magento-gl/ACQE-functional-deployment-v3-7

Karishmathakare19 · web-flow · commit 6cda09adcea9 · 2025-09-17T20:17:08.000+05:30
Bengals Functional Mainline deployment PR
diff --git a/app/code/Magento/AwsS3/Test/Mftf/Test/AwsS3AdminAddRemoveDefaultVideoSimpleProductTest.xml b/app/code/Magento/AwsS3/Test/Mftf/Test/AwsS3AdminAddRemoveDefaultVideoSimpleProductTest.xml
@@ -17,9 +17,6 @@
             <testCaseId value="MC-38693"/>
             <group value="remote_storage_aws_s3"/>
             <group value="skip_in_cloud_native_s3"/>
-            <skip>
-                <issueId value="MC-33903"/>
-            </skip>
             <group value="pr_exclude"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCategoryPathWithStoreCodeNoSuffixTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCategoryPathWithStoreCodeNoSuffixTest.xml
@@ -33,6 +33,10 @@
             <magentoCLI command="config:set {{CategoriesUrlSuffix.path}} {{CategoriesUrlSuffix.value}}" stepKey="resetCategoryUrlSuffixAsDefault"/>
             <!-- Reset configuration: Restore default product URL suffix -->
             <magentoCLI command="config:set {{ProductsUrlSuffix.path}} {{ProductsUrlSuffix.value}}" stepKey="resetProductUrlSuffixAsDefault"/>
+            <!-- Cache Flush -->
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </after>
         <remove keyForRemoval="navigateToCategoryStorefront"/>
         <!-- Step 7: Open direct Category 1.2 url -> Check that Cat 1.2 is highlighted & parent Cat 1 is also highlighted -->
diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/Test/StoreFrontAddOutOfStockProductToShoppingCartTest.xml b/app/code/Magento/CatalogInventory/Test/Mftf/Test/StoreFrontAddOutOfStockProductToShoppingCartTest.xml
@@ -17,6 +17,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="AC-5262"/>
             <group value="cloud"/>
+            <skip>
+                <issueId value="AC-15476">Skipped because of AC bug</issueId>
+            </skip>
         </annotations>
         <before>
             <!-- Set Enable Inventory Check On Cart Load = No -->
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminAddRemoveDefaultVideoDownloadableProductTest.xml b/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminAddRemoveDefaultVideoDownloadableProductTest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2020 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -20,9 +20,6 @@
             <group value="catalog"/>
             <group value="downloadable"/>
             <group value="productVideo"/>
-            <skip>
-                <issueId value="MC-33903"/>
-            </skip>
             <group value="pr_exclude"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminAddRemoveDefaultVideoSimpleProductTest.xml b/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminAddRemoveDefaultVideoSimpleProductTest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2020 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -19,9 +19,6 @@
             <testCaseId value="MC-206"/>
             <group value="catalog"/>
             <group value="productVideo"/>
-            <skip>
-                <issueId value="MC-33903"/>
-            </skip>
             <group value="pr_exclude"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/OrderData.xml b/app/code/Magento/Sales/Test/Mftf/Data/OrderData.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2023 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -45,4 +45,7 @@
         <data key="processing">Processing</data>
         <data key="ordered">Ordered</data>
     </entity>
+    <entity name="AdminPaymentErrorMessage" type="message">
+        <data key="error_Message">This payment method is not available.</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/PaymentConfigData.xml b/app/code/Magento/Sales/Test/Mftf/Data/PaymentConfigData.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2023 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -36,4 +36,12 @@
         <data key="label">payment/purchaseorder/active</data>
         <data key="value">0</data>
     </entity>
+    <entity name="cashOnDeliveryMaximumOrderTotalOrderPayment" type="config">
+        <data key="path">payment/cashondelivery/max_order_total</data>
+        <data key="value">100</data>
+    </entity>
+    <entity name="cashOnDeliveryMinimumOrderTotalOrderPayment" type="config">
+        <data key="path">payment/cashondelivery/min_order_total</data>
+        <data key="value">1</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
@@ -38,5 +38,7 @@
         <element name="DHLShipping" type="text" selector="//dd[@class='admin__order-shipment-methods-options' and contains(text(),'{{paymentMethodName}}')]" parameterized="true"/>
         <element name="shippingMethodName" type="text" selector="//*[contains(text(), '{{paymentMethodName}}')]" parameterized="true"/>
         <element name="verifyCheckMoneyPayment" type="text" selector="//label[@for='p_method_checkmo']"/>
+        <element name="paymentErrorMessage" type="text" selector="#order-message div.message-error"/>
+        <element name="verifyCashOnDelivery" type="text" selector="//label[@for='p_method_cashondelivery']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusGridSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-/**
- * Copyright 2019 Adobe
- * All Rights Reserved.
- */
+ /**
+  * Copyright 2019 Adobe
+  * All Rights Reserved.
+  */
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -17,7 +17,7 @@
         <element name="statusCode" type="input" selector="#sales_order_status_grid_filter_status"/>
         <element name="resetFilter" type="button" selector="//div[contains(concat(' ',normalize-space(@class),' '),' action-reset ')]" timeout="30"/>
         <element name="search" type="button" selector="[data-action='grid-filter-apply']" timeout="30"/>
-        <element name="gridCell" type="text" selector="//table[@id='sales_order_status_grid_table']/tbody/tr[{{row}}]/td[{{cellName}}]" parameterized="true" timeout="30"/>
+        <element name="gridCell" type="text" selector="//tr['{{row}}']//td[count(//div[contains(concat(' ',normalize-space(@class),' '),' admin__data-grid-wrap ')]//tr//th[contains(., '{{cellName}}')]/preceding-sibling::th) +1 ]" parameterized="true" timeout="30"/>
         <element name="stateCodeAndTitleDataColumn" type="input" selector="[data-role=row] [data-column=state]"/>
         <element name="unassign" type="text" selector="[data-role=row] [data-column=unassign] a" />
     </section>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithSimpleProductCustomOptionFileTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithSimpleProductCustomOptionFileTest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2020 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -47,6 +47,8 @@
         <actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer">
             <argument name="customer" value="$customer$"/>
         </actionGroup>
+        <conditionalClick selector="{{AdminOrderFormStoreSelectorSection.defaultStoreViewButton}}" dependentSelector="{{AdminOrderFormStoreSelectorSection.storeSelectorContainer}}" visible="true" stepKey="selectDefaultStoreView"/>
+        <waitForPageLoad stepKey="waitForAddProductPageOpened"/>
         <actionGroup ref="AdminAddSimpleProductWithCustomOptionFileToOrderActionGroup" stepKey="addSimpleProductToOrder">
             <argument name="product" value="$simpleProduct$"/>
             <argument name="productQty" value="$simpleProduct.quantity$"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminOrderPlacementWithPaymentMethodConstraintsTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminOrderPlacementWithPaymentMethodConstraintsTest.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright 2025 Adobe
+  * All Rights Reserved.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminOrderPlacementWithPaymentMethodConstraintsTest">
+        <annotations>
+            <features value="Sales"/>
+            <stories value="Admin Order Management"/>
+            <title value="Admin cannot handle order placement when payment methods are not available"/>
+            <description value="Verify admin order creation behavior when payment methods are disabled or not available due to order total constraints"/>
+            <severity value="MINOR"/>
+            <testCaseId value="AC-13220"/>
+            <group value="payment"/>
+            <group value="sales"/>
+            <group value="order_management"/>
+        </annotations>
+        <before>
+            <!-- Precondition 1: Create product -->
+            <createData entity="SimpleProduct_25" stepKey="simpleProduct">
+                <field key="price">10</field>
+            </createData>
+            <createData entity="Simple_US_Customer_CA" stepKey="simpleCustomer"/>
+            <!-- Step 1&2: Disable payment method one of "Check/Money Order" and  "Zero Subtotal Checkout" -->
+            <actionGroup ref="CliDisableCheckMoneyOrderPaymentMethodActionGroup" stepKey="disableCheckMoneyOrderValue"/>
+            <magentoCLI command="config:set {{DisableZeroSubtotalCheckoutConfigData.path}} {{DisableZeroSubtotalCheckoutConfigData.value}}" stepKey="disabledZeroSubtotalCheckoutOrderValue"/>
+            <!-- Step 3: Enable CashOnDelivery  -->
+            <createData entity="CashOnDeliveryPaymentMethodDefault" stepKey="enableCashOnDeliveryPaymentMethod"/>
+            <!-- Step 4: Set the Maximum Order Total and Maximum Order Total CashOnDelivery -->
+            <magentoCLI command="config:set {{cashOnDeliveryMaximumOrderTotalOrderPayment.path}} {{cashOnDeliveryMaximumOrderTotalOrderPayment.value}}" stepKey="cashOnDeliveryMaximumOrderTotalConfigData"/>
+            <magentoCLI command="config:set {{cashOnDeliveryMinimumOrderTotalOrderPayment.path}} {{cashOnDeliveryMinimumOrderTotalOrderPayment.value}}" stepKey="cashOnDeliveryMinimumOrderTotalOrderPayment"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Clean up created data -->
+            <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="simpleCustomer" stepKey="deleteCustomer"/>
+            <!-- Restore original payment method configurations -->
+            <magentoCLI command="config:set {{EnableCheckMoneyOrderPaymentMethod.path}} {{EnableCheckMoneyOrderPaymentMethod.value}}" stepKey="enableCheckMoneyOrderPaymentMethod"/>
+            <magentoCLI command="config:set {{disabledCashOnDeliveryPayment.label}} {{disabledCashOnDeliveryPayment.value}}" stepKey="restoreCOD"/>
+            <!-- Clear cache and logout -->
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
+        </after>
+        <!-- Step 5: Create an new order from admin -->
+        <actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer">
+            <argument name="customer" value="$$simpleCustomer$$"/>
+        </actionGroup>
+        <!-- Step 6: Add products to cart below 100$ and check COD available -->
+        <actionGroup ref="AddSimpleProductToOrderActionGroup" stepKey="addSimpleProductToOrder">
+            <argument name="product" value="$$simpleProduct$$"/>
+            <argument name="productQty" value="1"/>
+        </actionGroup>
+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.verifyCashOnDelivery}}" stepKey="verifyCashOnDeliveryPaymentMethodIsAvaiable"/>
+        <!-- Step 7: Add more products or increase quantity more than 100$ and check COD is not available -->
+        <actionGroup ref="AddSimpleProductToOrderActionGroup" stepKey="addSimpleProductAgainByChangingQuantity">
+            <argument name="product" value="$$simpleProduct$$"/>
+            <argument name="productQty" value="11"/>
+        </actionGroup>
+        <waitForElementNotVisible selector="{{AdminOrderFormPaymentSection.verifyCashOnDelivery}}" stepKey="verifyCashOnDeliveryPaymentMethodNotAvaiable"/>
+        <!-- Step 8: Submit order when no payment methods visible and verify error message -->
+        <actionGroup ref="OrderSelectFlatRateShippingActionGroup" stepKey="orderSelectFlatRateShippingMethod"/>
+        <actionGroup ref="AdminCheckoutSelectCheckMoneyOrderBillingMethodActionGroup" stepKey="selectBillingMethod"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder"/>
+        <waitForText selector="{{AdminOrderFormPaymentSection.paymentErrorMessage}}" userInput="{{AdminPaymentErrorMessage.error_Message}}" stepKey="verifyOrderDonotPlacedAndSeeErrorMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AssignCustomOrderStatusNotVisibleOnStorefrontTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AssignCustomOrderStatusNotVisibleOnStorefrontTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-/**
- * Copyright 2019 Adobe
- * All Rights Reserved.
- */
+ /**
+  * Copyright 2019 Adobe
+  * All Rights Reserved.
+  */
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -110,7 +110,7 @@
             <argument name="statusLabel" value="{{defaultOrderStatus.label}}"/>
             <argument name="statusCode" value="{{defaultOrderStatus.status}}"/>
         </actionGroup>
-        <see selector="{{AdminOrderStatusGridSection.gridCell('1', '1')}}" userInput="{{defaultOrderStatus.label}}" stepKey="seeOrderStatusInOrderGrid"/>
+        <see selector="{{AdminOrderStatusGridSection.gridCell('1', 'State Code and Title')}}" userInput="new[{{defaultOrderStatus.label}}]" stepKey="seeOrderStatusInOrderGrid"/>
 
         <!-- Create order and grab order id -->
         <actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer">
diff --git a/app/code/Magento/Sales/Test/Mftf/test-dependency-allowlist b/app/code/Magento/Sales/Test/Mftf/test-dependency-allowlist
@@ -17,3 +17,4 @@ AdminSetProductQuantityToEachSkusConfigurableProductActionGroup
 AdminConfigurableProductFormSection
 StorefrontSelectCheckMoneyOrderActionGroup
 StorefrontSalesOrderSection
+CliDisableCheckMoneyOrderPaymentMethodActionGroup
