From 0e964e496c0d83ab20974da51f2d21ba2680043e Mon Sep 17 00:00:00 2001
From: Rohan Hapani <rohan.hapani@magedelight.com>
Date: Fri, 20 Mar 2020 14:49:05 +0530
Subject: [PATCH 1/3] Solution : Advance search page allow minus price filter

---
 .../CatalogSearch/view/frontend/templates/advanced/form.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
index 3712f221233ee..26420705c7ffd 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
@@ -68,7 +68,7 @@
                                    class="input-text"
                                    type="text"
                                    maxlength="<?= $block->escapeHtmlAttr($maxQueryLength) ?>"
-                                   data-validate="{number:true, 'less-than-equals-to':'#<?= $block->escapeHtmlAttr($_code) ?>_to'}" />
+                                   data-validate="{number:true, 'validate-not-negative-number':true, 'less-than-equals-to':'#<?= $block->escapeHtmlAttr($_code) ?>_to'}" />
                         </div>
                     </div>
                     <div class="field with-addon no-label">
@@ -81,7 +81,7 @@
                                        class="input-text"
                                        type="text"
                                        maxlength="<?= $block->escapeHtmlAttr($maxQueryLength) ?>"
-                                       data-validate="{number:true, 'greater-than-equals-to':'#<?= $block->escapeHtmlAttr($_code) ?>'}" />
+                                       data-validate="{number:true, 'validate-not-negative-number':true, 'greater-than-equals-to':'#<?= $block->escapeHtmlAttr($_code) ?>'}" />
                                 <label class="addafter"
                                        for="<?= $block->escapeHtmlAttr($_code) ?>_to">
                                     <?= $block->escapeHtml($block->getCurrency($_attribute)) ?>

From 633b31337e91ff6048f464e1ba0758d7919e09eb Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Mon, 6 Apr 2020 16:16:11 +0300
Subject: [PATCH 2/3] Coverage mftf test

---
 ...SearchNegativeForPriceFieldActionGroup.xml | 24 +++++++++++++++++++
 ...thHintsData.xml => MessageAndHintData.xml} |  3 +++
 ...efrontCatalogSearchAdvancedFormSection.xml |  2 ++
 ...bleAdvancedSearchWithNegativePriceTest.xml | 24 +++++++++++++++++++
 4 files changed, 53 insertions(+)
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontAssertUnableSearchNegativeForPriceFieldActionGroup.xml
 rename app/code/Magento/CatalogSearch/Test/Mftf/Data/{MinMaxQueryLengthHintsData.xml => MessageAndHintData.xml} (76%)
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontCheckUnableAdvancedSearchWithNegativePriceTest.xml

diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontAssertUnableSearchNegativeForPriceFieldActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontAssertUnableSearchNegativeForPriceFieldActionGroup.xml
new file mode 100644
index 0000000000000..003cd0a0806e7
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontAssertUnableSearchNegativeForPriceFieldActionGroup.xml
@@ -0,0 +1,24 @@
+<?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="StorefrontAssertUnableSearchNegativeForPriceFieldActionGroup" extends="StorefrontFillFormAdvancedSearchActionGroup">
+        <remove keyForRemoval="waitForPageLoad" />
+        <grabTextFrom selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceFromError}}" stepKey="grabPriceFromError"/>
+        <grabTextFrom selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceToError}}" stepKey="grabPriceToError"/>
+        <assertEquals stepKey="assertErrorMessagePriceFrom">
+            <actualResult type="string">{{UnableNegativePrice.Error_message}}</actualResult>
+            <expectedResult type="string">$grabPriceFromError</expectedResult>
+        </assertEquals>
+        <assertEquals stepKey="assertErrorMessagePriceTo">
+            <actualResult type="string">{{UnableNegativePrice.Error_message}}</actualResult>
+            <expectedResult type="string">$grabPriceToError</expectedResult>
+        </assertEquals>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Data/MinMaxQueryLengthHintsData.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Data/MessageAndHintData.xml
similarity index 76%
rename from app/code/Magento/CatalogSearch/Test/Mftf/Data/MinMaxQueryLengthHintsData.xml
rename to app/code/Magento/CatalogSearch/Test/Mftf/Data/MessageAndHintData.xml
index 6fb254afea347..98ef8de72b633 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Data/MinMaxQueryLengthHintsData.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Data/MessageAndHintData.xml
@@ -11,4 +11,7 @@
     <entity name="MinMaxQueryLength" type="constant">
         <data key="Hint">This value must be compatible with the corresponding setting in the configured search engine</data>
     </entity>
+    <entity name="UnableNegativePrice" type="constant">
+        <data key="Error_message">Please enter a number 0 or greater in this field.</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedFormSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedFormSection.xml
index 6889025530098..540243abc6ad1 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedFormSection.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedFormSection.xml
@@ -16,6 +16,8 @@
         <element name="ShortDescription" type="input" selector="#short_description"/>
         <element name="PriceFrom" type="input" selector="#price"/>
         <element name="PriceTo" type="input" selector="#price_to"/>
+        <element name="PriceFromError" type="text" selector="#price-error"/>
+        <element name="PriceToError" type="text" selector="#price_to-error"/>
         <element name="AttributeByCode" type="input" selector="#{{var1}}" parameterized="true"/>
         <element name="SubmitButton" type="button" selector="//*[@id='form-validate']//button[@type='submit']"/>
     </section>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontCheckUnableAdvancedSearchWithNegativePriceTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontCheckUnableAdvancedSearchWithNegativePriceTest.xml
new file mode 100644
index 0000000000000..67e9fdd43f5fe
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontCheckUnableAdvancedSearchWithNegativePriceTest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCheckUnableAdvancedSearchWithNegativePriceTest">
+        <annotations>
+            <stories value="Use Advanced Search"/>
+            <title value="Unable negative price use to advanced search"/>
+            <description value="Check unable negative price use to advanced search by price from and price to"/>
+        </annotations>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefront"/>
+        <actionGroup ref="StorefrontOpenAdvancedSearchActionGroup" stepKey="openAdvancedSearch"/>
+        <actionGroup ref="StorefrontAssertUnableSearchNegativeForPriceFieldActionGroup" stepKey="assertUnableSearch">
+            <argument name="price_to" value="-50"/>
+            <argument name="price_from" value="-10"/>
+        </actionGroup>
+    </test>
+</tests>

From a1f37fb9b8656acb35a4d5057eb03110f4c65452 Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Tue, 7 Apr 2020 14:22:29 +0300
Subject: [PATCH 3/3] Static test fix

---
 .../CatalogSearch/view/frontend/templates/advanced/form.phtml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
index 26420705c7ffd..f158cebf41aae 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
@@ -5,6 +5,7 @@
  */
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+// @codingStandardsIgnoreFile
 ?>
 <?php
 /**