Merge branch 'ACQE-9002' into ACQE-functional-deployment-v4-7

Author: Karishmathakare19

app/code/Magento/Swatches/Test/Mftf/ActionGroup/StorefrontSelectSwatchOptionOnCategoryPageWithHoverActionGroup.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Select a swatch option on category page with hover - handles overlapping swatches-->
+    <actionGroup name="StorefrontSelectSwatchOptionOnCategoryPageWithHoverActionGroup">
+        <annotations>
+            <description>Scrolls to and clicks a swatch option by label on the category page with hover behavior for overlapping swatch elements.</description>
+        </annotations>
+        <arguments>
+            <argument name="optionLabel" type="string"/>
+        </arguments>
+        <scrollTo selector="{{StorefrontCategoryPageProductInfoSection.swatchOptionByLabel(optionLabel)}}" stepKey="scrollToSwatchOption"/>
+        <moveMouseOver selector="{{StorefrontCategoryPageProductInfoSection.swatchOptionByLabel(optionLabel)}}" stepKey="hoverOverSwatchOption"/>
+        <waitForElementClickable selector="{{StorefrontCategoryPageProductInfoSection.swatchOptionByLabel(optionLabel)}}" stepKey="waitForSwatchOptionClickable"/>
+        <click selector="{{StorefrontCategoryPageProductInfoSection.swatchOptionByLabel(optionLabel)}}" stepKey="clickSwatchOption"/>
+        <waitForPageLoad stepKey="waitAfterSwatchClick"/>
+    </actionGroup>
+</actionGroups>
+

app/code/Magento/Swatches/Test/Mftf/ActionGroup/StorefrontSelectSwatchOptionOnProductPageWithScrollAndHoverActionGroup.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Select a swatch option on product page with scroll and hover - handles overlapping swatches-->
+    <actionGroup name="StorefrontSelectSwatchOptionOnProductPageWithScrollAndHoverActionGroup" extends="StorefrontSelectSwatchOptionOnProductPageActionGroup">
+        <annotations>
+            <description>Extends StorefrontSelectSwatchOptionOnProductPageActionGroup to add scroll, hover behavior for overlapping swatch elements.</description>
+        </annotations>
+        <scrollTo selector="{{StorefrontProductInfoMainSection.swatchOptionByLabel(optionName)}}" stepKey="scrollToSwatchOption" before="waitForCreateConfigurationsButtonToBeClickable"/>
+        <moveMouseOver selector="{{StorefrontProductInfoMainSection.swatchOptionByLabel(optionName)}}" stepKey="hoverOverSwatchOption" after="scrollToSwatchOption"/>
+        <waitForElementClickable selector="{{StorefrontProductInfoMainSection.swatchOptionByLabel(optionName)}}" stepKey="waitForSwatchOptionClickable" after="hoverOverSwatchOption"/>
+        <waitForPageLoad stepKey="waitAfterSwatchClick" after="clickSwatchOption"/>
+    </actionGroup>
+</actionGroups>
+

app/code/Magento/Swatches/Test/Mftf/Section/StorefrontCategoryPageProductInfoSection.xml

@@ -10,6 +10,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCategoryPageProductInfoSection">
         <element name="visualSwatchOption" type="button" selector="#product-item-info_{{var1}} .swatch-option[data-option-label='{{var2}}']" parameterized="true"/>
+        <element name="swatchOptionByLabel" type="button" selector=".products-grid .swatch-option[data-option-label='{{var1}}']" parameterized="true"/>
         <element name="productAddToWishlist" type="button" selector="#product-item-info_{{var1}} .action.towishlist" parameterized="true"/>
     </section>
 </sections>