Merge remote-tracking branch 'origin/MC-17940' into 2.2-develop-pr35

Author: serhii-balko

app/code/Magento/Customer/Test/Mftf/Test/SearchByEmailInCustomerGridTest.xml

@@ -0,0 +1,45 @@
+<?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="SearchByEmailInCustomerGridTest">
+        <annotations>
+            <features value="Customer"/>
+            <stories value="Customer grid search"/>
+            <title value="Admin customer grid email searching"/>
+            <description value="Admin customer grid searching by email in keyword"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-18137"/>
+            <useCaseId value="MC-17940"/>
+            <group value="customer"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer" stepKey="createFirstCustomer"/>
+            <createData entity="Simple_US_Customer" stepKey="createSecondCustomer"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createFirstCustomer" stepKey="deleteFirstCustomer"/>
+            <deleteData createDataKey="createSecondCustomer" stepKey="deleteSecondCustomer"/>
+            <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearCustomerGridFilter"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Step 1: Go to Customers > All Customers-->
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <!--Step 2: On Customers grid page search customer by keyword-->
+        <actionGroup ref="searchAdminDataGridByKeyword" stepKey="searchCustomer">
+            <argument name="keyword" value="$$createSecondCustomer.email$$"/>
+        </actionGroup>
+        <!--Step 3: Check if customer is placed in a first row and clear grid filter-->
+        <actionGroup ref="AdminAssertCustomerInCustomersGrid" stepKey="checkCustomerInGrid">
+            <argument name="text" value="$$createSecondCustomer.email$$"/>
+            <argument name="row" value="1"/>
+        </actionGroup>
+    </test>
+</tests>

lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php

@@ -15,6 +15,14 @@
  */
 class FulltextFilter implements FilterApplierInterface
 {
+    /**
+     * Patterns using for escaping special characters
+     */
+    private $escapePatterns = [
+        '/[@\.]/' => '\_',
+        '/([+\-><\(\)~*]+)/' => ' ',
+    ];
+
     /**
      * Returns list of columns from fulltext index (doesn't support more then one FTI per table)
      *
@@ -70,7 +78,7 @@ function ($column) use ($alias) {
      */
     private function escapeAgainstValue(string $value): string
     {
-        return preg_replace('/([+\-><\(\)~*@]+)/', ' ', $value);
+        return preg_replace(array_keys($this->escapePatterns), array_values($this->escapePatterns), $value);
     }
 
     /**