From af178560c050518c2a1aa8aea0357faafb35377e Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Tue, 7 Mar 2017 14:37:22 -0600 Subject: [PATCH] Code improvements --- app/assets/javascripts/filtered_search/dropdown_utils.js | 1 + spec/features/issues/filtered_search/filter_issues_spec.rb | 4 ++-- spec/features/merge_requests/filter_by_labels_spec.rb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/filtered_search/dropdown_utils.js b/app/assets/javascripts/filtered_search/dropdown_utils.js index 14f0d0d0ff2..b52081df646 100644 --- a/app/assets/javascripts/filtered_search/dropdown_utils.js +++ b/app/assets/javascripts/filtered_search/dropdown_utils.js @@ -79,6 +79,7 @@ return dataValue !== null; } + // Determines the full search query (visual tokens + input) static getSearchQuery() { const tokensContainer = document.querySelector('.tokens-container'); const values = []; diff --git a/spec/features/issues/filtered_search/filter_issues_spec.rb b/spec/features/issues/filtered_search/filter_issues_spec.rb index 35bd37933bc..f079a9627e4 100644 --- a/spec/features/issues/filtered_search/filter_issues_spec.rb +++ b/spec/features/issues/filtered_search/filter_issues_spec.rb @@ -112,7 +112,7 @@ describe 'Filter issues', js: true, feature: true do end context 'author with other filters' do - search_term = 'issue' + let(:search_term) { 'issue' } it 'filters issues by searched author and text' do input_filtered_search("author:@#{user.username} #{search_term}") @@ -536,7 +536,7 @@ describe 'Filter issues', js: true, feature: true do end context 'milestone with other filters' do - search_term = 'bug' + let(:search_term) { 'bug' } it 'filters issues by searched milestone and text' do input_filtered_search("milestone:%#{milestone.title} #{search_term}") diff --git a/spec/features/merge_requests/filter_by_labels_spec.rb b/spec/features/merge_requests/filter_by_labels_spec.rb index 5ba9743e926..55f3c1863ff 100644 --- a/spec/features/merge_requests/filter_by_labels_spec.rb +++ b/spec/features/merge_requests/filter_by_labels_spec.rb @@ -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 before do - input_filtered_search('label:~bug label:~enhancement ') + input_filtered_search('label:~bug label:~enhancement') end it 'applies the filters' do