Merge branch 'ACQE-8247' into ACQE-functional-deployment-version12

Author: chandrakalahanchinal

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminUpdateCategoryDisplaySettingsWithCustomValuesActionGroup.xml

@@ -0,0 +1,29 @@
+<?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">
+    <actionGroup name="AdminUpdateCategoryDisplaySettingsWithCustomValuesActionGroup"
+                 extends="AdminUpdateCategoryDisplaySettingsActionGroup">
+        <annotations>
+            <description>Update Category Display settings with custom values (unchecks Use Config first)</description>
+        </annotations>
+        <arguments>
+            <argument name="availableSortOptions" type="string" defaultValue="Product Name"/>
+            <argument name="defaultSortingOption" type="string" defaultValue="name"/>
+            <argument name="priceRange" type="string" defaultValue="5.5"/>
+        </arguments>
+        <!-- Override the checkbox behavior to uncheck instead of check -->
+        <remove keyForRemoval="enableTheAvailableProductList" />
+        <uncheckOption selector="{{CategoryDisplaySettingsSection.productListCheckBox}}" after="selectDisplaySetting"
+                       stepKey="uncheckUseConfigForAvailableSort"/>
+        <remove keyForRemoval="enableTheDefaultProductList" />
+        <uncheckOption selector="{{CategoryDisplaySettingsSection.defaultProductLisCheckBox}}"
+                       after="scrollToDefaultProductList" stepKey="uncheckUseConfigForDefaultSort"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontVerifyCategoryContentActionGroup.xml

@@ -0,0 +1,30 @@
+<?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">
+    <actionGroup name="StorefrontVerifyCategoryContentActionGroup">
+        <annotations>
+            <description>Verify category content on storefront including image, description, meta title, and product count</description>
+        </annotations>
+        <arguments>
+            <argument name="description" type="string" defaultValue="categoryDescription"/>
+            <argument name="metaTitle" type="string" defaultValue="metaTitle"/>
+            <argument name="productCount" type="string" defaultValue="1"/>
+        </arguments>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.categoryImage}}"
+                               stepKey="verifyImageVisible"/>
+        <waitForText userInput="{{description}}"
+                     selector="{{StorefrontCategoryMainSection.CatalogDescriptionWithoutPTag}}"
+                     stepKey="verifyDescription"/>
+        <waitForElement selector="{{StorefrontCategoryHeadSection.pageTitle(metaTitle)}}"
+                        stepKey="verifyMetaTitle"/>
+        <waitForText userInput="{{productCount}}" selector="{{StorefrontCategoryMainSection.productCount}}"
+                     stepKey="verifyProductCount"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Catalog/Test/Mftf/Data/CategoryDisplaySettingsData.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="CategoryDisplaySettings" type="category">
+        <data key="available_sort_by">Product Name</data>
+        <data key="default_sort_by">name</data>
+        <data key="filter_price_range">5.5</data>
+    </entity>
+</entities>