MTA-2480: Extend Use Advanced Search

- CR Changes

Author: Oleksii Kolesnyk

dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml

@@ -33,6 +33,26 @@
             </field>
         </dataset>
 
+        <dataset name="tax_class_id">
+            <field name="attribute_id" xsi:type="number">172</field>
+            <field name="frontend_label" xsi:type="string">Tax Class</field>
+            <field name="attribute_code" xsi:type="string">tax_class_id</field>
+            <field name="frontend_input" xsi:type="string">Dropdown</field>
+            <field name="is_required" xsi:type="string">No</field>
+            <field name="options" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="is_default" xsi:type="string">No</item>
+                    <item name="admin" xsi:type="string">None</item>
+                    <item name="view" xsi:type="string">None</item>
+                </item>
+                <item name="1" xsi:type="array">
+                    <item name="is_default" xsi:type="string">Yes</item>
+                    <item name="admin" xsi:type="string">Taxable Goods</item>
+                    <item name="view" xsi:type="string">Taxable Goods</item>
+                </item>
+            </field>
+        </dataset>
+
         <dataset name="attribute_type_text_field">
             <field name="frontend_label" xsi:type="string">attribute_text%isolation%</field>
             <field name="attribute_code" xsi:type="string">attribute_text%isolation%</field>

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml

@@ -98,13 +98,13 @@
             <data name="productAttribute/data/used_in_product_listing" xsi:type="string">Yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeInGrid" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertAttributeForm" />
-            <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductByAttribute" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeDisplayingOnFrontend" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeDisplayingOnSearchForm" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeIsComparable" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeIsFilterable" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeIsFilterableInSearch" />
+            <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductByAttribute" />
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAttributeSearchableByLabel" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertAttributeOptionsOnProductForm" />
         </variation>

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.xml

@@ -52,7 +52,7 @@
         </variation>
         <variation name="UpdateProductAttributeEntityTestVariation3">
             <data name="productTemplate/dataset" xsi:type="string">custom_attribute_set</data>
-            <data name="productAttributeOriginal/dataset" xsi:type="string">quantity_and_stock_status</data>
+            <data name="productAttributeOriginal/dataset" xsi:type="string">tax_class_id</data>
             <data name="attribute/data/is_searchable" xsi:type="string">Yes</data>
             <data name="attribute/data/is_visible_in_advanced_search" xsi:type="string">Yes</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductByAttribute" />

dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Form.xml

@@ -25,9 +25,5 @@
         <price_to>
             <selector>#price_to</selector>
         </price_to>
-        <tax_class_id>
-            <selector>#tax_class_id</selector>
-            <input>select</input>
-        </tax_class_id>
     </fields>
 </mapping>

dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.xml

@@ -112,13 +112,6 @@
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductsResult" />
         </variation>
         <variation name="AdvancedSearchEntityTestVariation14">
-            <data name="description" xsi:type="string">Search product in advanced search by Tax Class</data>
-            <data name="products/simple_1" xsi:type="string">Yes</data>
-            <data name="products/simple_2" xsi:type="string">-</data>
-            <data name="productSearch/data/tax_class_id" xsi:type="string">Taxable Goods</data>
-            <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductsResult" />
-        </variation>
-        <variation name="AdvancedSearchEntityTestVariation15">
             <data name="description" xsi:type="string">Negative product search</data>
             <data name="productSearch/data/name" xsi:type="string">Negative_product_search</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchNoResult" />