Merge branch 'ACP2E-1564' of https://github.com/magento-l3/magento2ce into PR-02142023

Author: chittima

app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml

@@ -6,10 +6,14 @@
 
 use Magento\Framework\App\Action\Action;
 
-/** @var \Magento\CatalogWidget\Block\Product\ProductsList $block */
+/**
+ * @var \Magento\CatalogWidget\Block\Product\ProductsList $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 
 // phpcs:disable Generic.Files.LineLength.TooLong
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundHelper
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php if ($exist = ($block->getProductCollection() && $block->getProductCollection()->getSize())): ?>
     <?php
@@ -76,6 +80,17 @@ use Magento\Framework\App\Action\Action;
                                                                 <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
                                                             </button>
                                                         </form>
+                                                        <?php if ($block->getBlockHtml('formkey')): ?>
+                                                        <script type="text/x-magento-init">
+                                                        {
+                                                            "[data-role=tocart-form], .form.map.checkout": {
+                                                                "catalogAddToCart": {
+                                                                    "product_sku": "<?= $escaper->escapeJs($_item->getSku()); ?>"
+                                                                }
+                                                            }
+                                                        }
+                                                        </script>
+                                                        <?php endif;?>
                                                     <?php else: ?>
                                                         <?php if ($_item->isAvailable()): ?>
                                                             <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
@@ -113,13 +128,4 @@ use Magento\Framework\App\Action\Action;
             <?= $block->getPagerHtml() ?>
         </div>
     </div>
-    <?php if($block->getBlockHtml('formkey')): ?>
-    <script type="text/x-magento-init">
-    {
-        ".block.widget [data-role=tocart-form]": {
-            "Magento_Catalog/js/validate-product": {}
-        }
-    }
-    </script>
-    <?php endif;?>
 <?php endif;?>

app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontAssertProductQtyInMinicartActionGroup.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontAssertProductQtyInMinicartActionGroup">
+        <annotations>
+            <description>Open the mini cart, locate the provided product and assert the quantity of it that was added to the cart</description>
+        </annotations>
+        <arguments>
+            <argument name="product" type="entity"/>
+            <argument name="qty" type="string" defaultValue="1"/>
+        </arguments>
+
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="openMiniShoppingCart"/>
+        <grabValueFrom selector="{{StorefrontMinicartSection.itemQuantityBySku(product.sku)}}" stepKey="grabMiniCartQty"/>
+        <assertStringContainsString stepKey="assertMiniCartQty">
+            <actualResult type="variable">$grabMiniCartQty</actualResult>
+            <expectedResult type="string">{{qty}}</expectedResult>
+        </assertStringContainsString>
+    </actionGroup>
+</actionGroups>