Skip to content

Commit 51643b4

Browse files
committed
Merge remote-tracking branch 'origin/MAGETWO-99605' into 2.3-develop-pr22
2 parents 82fac95 + 99149df commit 51643b4

File tree

2 files changed

+49
-1
lines changed

2 files changed

+49
-1
lines changed
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminExactMatchSearchInCustomerGridTest">
11+
<annotations>
12+
<features value="Customer"/>
13+
<stories value="Customer Search"/>
14+
<title value="Admin customer grid exact match searching"/>
15+
<description value="Admin customer grid exact match searching with quotes in keyword"/>
16+
<severity value="MAJOR"/>
17+
<testCaseId value="MC-16335"/>
18+
<useCaseId value="MAGETWO-99605"/>
19+
<group value="customer"/>
20+
</annotations>
21+
<before>
22+
<createData entity="Simple_US_Customer" stepKey="createFirstCustomer"/>
23+
<createData entity="Simple_US_Customer" stepKey="createSecondCustomer">
24+
<field key="firstname">&quot;Jane Doe&quot;</field>
25+
</createData>
26+
<actionGroup ref="LoginAsAdmin" stepKey="login"/>
27+
</before>
28+
<after>
29+
<deleteData createDataKey="createFirstCustomer" stepKey="deleteFirstCustomer"/>
30+
<deleteData createDataKey="createSecondCustomer" stepKey="deleteSecondCustomer"/>
31+
<amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
32+
<actionGroup ref="AdminResetFilterInCustomerAddressGrid" stepKey="clearCustomerGridFilter"/>
33+
<actionGroup ref="logout" stepKey="logout"/>
34+
</after>
35+
<!--Step 1: Go to Customers > All Customers-->
36+
<amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
37+
<!--Step 2: On Customers grid page search customer by keyword with quotes-->
38+
<actionGroup ref="searchAdminDataGridByKeyword" stepKey="searchCustomer">
39+
<argument name="keyword" value="$$createSecondCustomer.firstname$$"/>
40+
</actionGroup>
41+
<!--Step 3: Check if customer is placed in a first row and clear grid filter-->
42+
<actionGroup ref="AdminAssertCustomerInCustomersGrid" stepKey="checkCustomerInGrid">
43+
<argument name="text" value="$$createSecondCustomer.fullname$$"/>
44+
<argument name="row" value="1"/>
45+
</actionGroup>
46+
</test>
47+
</tests>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,13 @@ function ($column) use ($alias) {
6464

6565
/**
6666
* Escape against value
67+
*
6768
* @param string $value
6869
* @return string
6970
*/
7071
private function escapeAgainstValue(string $value): string
7172
{
72-
return preg_replace('/([+\-><\(\)~*\"@]+)/', ' ', $value);
73+
return preg_replace('/([+\-><\(\)~*@]+)/', ' ', $value);
7374
}
7475

7576
/**

0 commit comments

Comments
 (0)