From 72d22ad56b075177d9be5775d1a67e65bd75e5cd Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 14 Mar 2016 23:29:39 +0100 Subject: [PATCH] Add * automatically to normal queries. --- lib/search_index_backend.rb | 5 +++++ test/browser/agent_ticket_overview_level0_test.rb | 6 +++--- test/browser/agent_ticket_overview_level1_test.rb | 6 +++--- test/browser_test_helper.rb | 4 ++-- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/search_index_backend.rb b/lib/search_index_backend.rb index 3b9e8ebab..6d96538ca 100644 --- a/lib/search_index_backend.rb +++ b/lib/search_index_backend.rb @@ -185,6 +185,11 @@ return search result data['query']['bool']['must'] = [] end + # add * on simple query search + if query && query =~ /^\w+$/ + query += '*' + end + # real search condition condition = { 'query_string' => { diff --git a/test/browser/agent_ticket_overview_level0_test.rb b/test/browser/agent_ticket_overview_level0_test.rb index 489097ace..0a590015b 100644 --- a/test/browser/agent_ticket_overview_level0_test.rb +++ b/test/browser/agent_ticket_overview_level0_test.rb @@ -16,7 +16,7 @@ class AgentTicketOverviewLevel0Test < TestCase # create new ticket ticket1 = ticket_create( data: { - customer: 'nico*', + customer: 'nico', group: 'Users', title: 'overview count test #1', body: 'overview count test #1', @@ -24,7 +24,7 @@ class AgentTicketOverviewLevel0Test < TestCase ) ticket2 = ticket_create( data: { - customer: 'nico*', + customer: 'nico', group: 'Users', title: 'overview count test #2', body: 'overview count test #2', @@ -178,7 +178,7 @@ class AgentTicketOverviewLevel0Test < TestCase # create new ticket ticket3 = ticket_create( data: { - customer: 'nico*', + customer: 'nico', group: 'Users', title: 'overview count test #3', body: 'overview count test #3', diff --git a/test/browser/agent_ticket_overview_level1_test.rb b/test/browser/agent_ticket_overview_level1_test.rb index 4c8bae5a2..12a87c22d 100644 --- a/test/browser/agent_ticket_overview_level1_test.rb +++ b/test/browser/agent_ticket_overview_level1_test.rb @@ -52,7 +52,7 @@ class AgentTicketOverviewLevel1Test < TestCase ticket1 = ticket_create( browser: browser1, data: { - customer: 'nico*', + customer: 'nico', priority: '1 low', group: 'Users', title: 'overview #1', @@ -69,7 +69,7 @@ class AgentTicketOverviewLevel1Test < TestCase ticket2 = ticket_create( browser: browser1, data: { - customer: 'nico*', + customer: 'nico', priority: '1 low', group: 'Users', title: 'overview #2', @@ -80,7 +80,7 @@ class AgentTicketOverviewLevel1Test < TestCase ticket3 = ticket_create( browser: browser1, data: { - customer: 'nico*', + customer: 'nico', priority: '1 low', group: 'Users', title: 'overview #3', diff --git a/test/browser_test_helper.rb b/test/browser_test_helper.rb index 920aaa4ca..fbe34597e 100644 --- a/test/browser_test_helper.rb +++ b/test/browser_test_helper.rb @@ -1219,7 +1219,7 @@ wait untill text in selector disabppears element.clear # workaround, sometimes focus is not triggered - element.send_keys(params[:customer] + '*') + element.send_keys(params[:customer]) sleep 3.5 # check if pulldown is open, it's not working stable via selenium @@ -1487,7 +1487,7 @@ wait untill text in selector disabppears element.clear # workaround, sometimes focus is not triggered - element.send_keys(data[:customer] + '*') + element.send_keys(data[:customer]) sleep 3.5 # check if pulldown is open, it's not working stable via selenium