MAGETWO-96192: Products with "Less Than", "Greater Than", "Less Than Or Equal", "Greater Than Or Equal" condition returns error on storefront

- Added < and > to list of encoded characters

Author: nathanjosiah

app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml

@@ -98,6 +98,9 @@
         <element name="AddParam" type="button" selector=".rule-param-add"/>
         <element name="ConditionsDropdown" type="select" selector="#conditions__1__new_child"/>
         <element name="RuleParam" type="button" selector="//a[text()='...']"/>
+        <element name="RuleParamSelect" type="select" selector="//ul[contains(@class,'rule-param-children')]/li[{{arg1}}]//*[contains(@class,'rule-param')][{{arg2}}]//select" parameterized="true"/>
+        <element name="RuleParamInput" type="input" selector="//ul[contains(@class,'rule-param-children')]/li[{{arg1}}]//*[contains(@class,'rule-param')][{{arg2}}]//input" parameterized="true"/>
+        <element name="RuleParamLabel" type="input" selector="//ul[contains(@class,'rule-param-children')]/li[{{arg1}}]//*[contains(@class,'rule-param')][{{arg2}}]//a" parameterized="true"/>
         <element name="Chooser" type="button" selector="//img[@title='Open Chooser']"/>
         <element name="PageSize" type="input" selector="input[name='parameters[page_size]']"/>
         <element name="ProductAttribute" type="multiselect" selector="select[name='parameters[show_attributes][]']" />

app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml

@@ -57,8 +57,29 @@
         <click selector="{{WidgetSection.RuleParam}}" stepKey="clickRuleParam" />
         <waitForElementVisible selector="{{WidgetSection.Chooser}}" stepKey="waitForElement" />
         <click selector="{{WidgetSection.Chooser}}" stepKey="clickChooser" />
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear3" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear4" />
         <click selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="selectPreCategory" />
+
+        <!-- Test that the "<" operand functions correctly -->
+        <click selector="{{WidgetSection.AddParam}}" stepKey="clickAddParamBtn2" />
+        <waitForElementVisible selector="{{WidgetSection.ConditionsDropdown}}" stepKey="waitForDropdownVisible2"/>
+        <selectOption selector="{{WidgetSection.ConditionsDropdown}}" userInput="Price" stepKey="selectPriceCondition"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear3"/>
+        <click selector="{{WidgetSection.RuleParamLabel('2','1')}}" stepKey="clickOperatorLabel"/>
+        <selectOption selector="{{WidgetSection.RuleParamSelect('2','1')}}" userInput="&lt;" stepKey="selectLessThanCondition"/>
+        <click selector="{{WidgetSection.RuleParam}}" stepKey="clickRuleParam2"/>
+        <fillField selector="{{WidgetSection.RuleParamInput('2','2')}}" userInput="125" stepKey="fillMaxPrice"/>
+
+        <!-- Test that the ">" operand functions correctly -->
+        <click selector="{{WidgetSection.AddParam}}" stepKey="clickAddParamBtn3" />
+        <waitForElementVisible selector="{{WidgetSection.ConditionsDropdown}}" stepKey="waitForDropdownVisible3"/>
+        <selectOption selector="{{WidgetSection.ConditionsDropdown}}" userInput="Price" stepKey="selectPriceCondition2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear5"/>
+        <click selector="{{WidgetSection.RuleParamLabel('3','1')}}" stepKey="clickOperatorLabel2"/>
+        <selectOption selector="{{WidgetSection.RuleParamSelect('3','1')}}" userInput="&gt;" stepKey="selectLessThanCondition2"/>
+        <click selector="{{WidgetSection.RuleParam}}" stepKey="clickRuleParam3"/>
+        <fillField selector="{{WidgetSection.RuleParamInput('3','2')}}" userInput="1" stepKey="fillMinPrice"/>
+
         <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
         <waitForPageLoad stepKey="wait6" />
         <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />

lib/internal/Magento/Framework/Data/Wysiwyg/Normalizer.php

@@ -10,12 +10,13 @@
  */
 class Normalizer
 {
-
     const WYSIWYG_RESERVED_CHARACTERS_REPLACEMENT_MAP = [
         '{' => '^[',
         '}' => '^]',
         '"' => '`',
         '\\' => '|',
+        '<' => '^(',
+        '>' => '^)'
     ];
 
     /**