Commit bd1d7781 authored by Alfredo Sumaran's avatar Alfredo Sumaran

Merge branch 'filtered-search-visual-tokens-improvements' into 'master'

Filtered Search Visual Tokens code improvements

See merge request !9781
parents cb19fd14 af178560
...@@ -79,6 +79,7 @@ ...@@ -79,6 +79,7 @@
return dataValue !== null; return dataValue !== null;
} }
// Determines the full search query (visual tokens + input)
static getSearchQuery() { static getSearchQuery() {
const tokensContainer = document.querySelector('.tokens-container'); const tokensContainer = document.querySelector('.tokens-container');
const values = []; const values = [];
......
...@@ -112,7 +112,7 @@ describe 'Filter issues', js: true, feature: true do ...@@ -112,7 +112,7 @@ describe 'Filter issues', js: true, feature: true do
end end
context 'author with other filters' do context 'author with other filters' do
search_term = 'issue' let(:search_term) { 'issue' }
it 'filters issues by searched author and text' do it 'filters issues by searched author and text' do
input_filtered_search("author:@#{user.username} #{search_term}") input_filtered_search("author:@#{user.username} #{search_term}")
...@@ -536,7 +536,7 @@ describe 'Filter issues', js: true, feature: true do ...@@ -536,7 +536,7 @@ describe 'Filter issues', js: true, feature: true do
end end
context 'milestone with other filters' do context 'milestone with other filters' do
search_term = 'bug' let(:search_term) { 'bug' }
it 'filters issues by searched milestone and text' do it 'filters issues by searched milestone and text' do
input_filtered_search("milestone:%#{milestone.title} #{search_term}") input_filtered_search("milestone:%#{milestone.title} #{search_term}")
......
...@@ -70,7 +70,7 @@ feature 'Issue filtering by Labels', feature: true, js: true do ...@@ -70,7 +70,7 @@ feature 'Issue filtering by Labels', feature: true, js: true do
context 'filter by label enhancement and bug in issues list' do context 'filter by label enhancement and bug in issues list' do
before do before do
input_filtered_search('label:~bug label:~enhancement ') input_filtered_search('label:~bug label:~enhancement')
end end
it 'applies the filters' do it 'applies the filters' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment