Merge branch 'ACQE-8844' into ACQE-functional-deployment-version23

Author: chandrakalahanchinal

app/code/Magento/Swatches/Test/Mftf/Data/SwatchAttributeOptionData.xml

@@ -32,4 +32,61 @@
         <requiredEntity type="StoreLabel">Option3Store0</requiredEntity>
         <requiredEntity type="StoreLabel">Option3Store1</requiredEntity>
     </entity>
+    <!-- Visual Swatch Options: A, B, C -->
+    <entity name="VisualSwatchOptionA" type="ProductSwatchAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label">A</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">0</data>
+    </entity>
+    <entity name="VisualSwatchOptionB" type="ProductSwatchAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label">B</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">1</data>
+    </entity>
+    <entity name="VisualSwatchOptionC" type="ProductSwatchAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label">C</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">2</data>
+    </entity>
+    <!-- Text Swatch Attribute 1 Options: 1, 2, 3 -->
+    <entity name="TextSwatchOption1" type="ProductSwatchAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label">1</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">0</data>
+    </entity>
+    <entity name="TextSwatchOption2" type="ProductSwatchAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label">2</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">1</data>
+    </entity>
+    <entity name="TextSwatchOption3" type="ProductSwatchAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label">3</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">2</data>
+    </entity>
+    <!-- Text Swatch Attribute 2 Options: X, Y, Z -->
+    <entity name="TextSwatchOptionX" type="ProductSwatchAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label">X</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">0</data>
+    </entity>
+    <entity name="TextSwatchOptionY" type="ProductSwatchAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label">Y</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">1</data>
+    </entity>
+    <entity name="TextSwatchOptionZ" type="ProductSwatchAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label">Z</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">2</data>
+    </entity>
 </entities>

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

@@ -14,8 +14,10 @@
         <element name="expandedSwatchThumbnails" type="block" selector="//div[@aria-expanded='true' and contains(text(),'{{attribute_code}}')]/..//div[contains(@class,'{{swatch_types}}')]" parameterized="true"/>
         <element name="swatchThumbnailsImgLayeredNav" type="block" selector="//div[@class='image' and contains(@style,'{{swatch_thumb}}')]" parameterized="true"/>
         <element name="swatchTextLayeredNav" type="block" selector="//div[@class='swatch-option text ' and @data-option-label='{{args}}']" parameterized="true"/>
+        <element name="swatchVisualLayeredNav" type="block" selector="//div[@class='swatch-option ' and @data-option-label='{{args}}']" parameterized="true"/>
         <element name="swatchTextLayeredNavHover" type="block" selector="//div[@class='title' and text()='{{args}}']" parameterized="true"/>
         <element name="swatchSelectedInFilteredProd" type="block" selector="//div[@class='swatch-option {{args}} selected']" parameterized="true"/>
         <element name="swatchTextFilteredProdHover" type="block" selector="//div[@class='swatch-option-tooltip']//div[@class='title' and contains(text(),'{{args}}')]" parameterized="true"/>
+        <element name="removeFilterByAttributeLabel" type="button" selector="//ol[@class='items']//li[contains(@class,'item')]//span[@class='filter-label' and contains(text(),'{{attribute_label}}')]/..//a[contains(@class,'action remove')]" parameterized="true"/>
     </section>
 </sections>