Add latest changes from gitlab-org/gitlab@master

12 files changed, 197 insertions, 74 deletions

diff --git a/spec/features/issues/filtered_search/dropdown_assignee_spec.rb b/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
index 2d7f5822996..8aa29cddd5f 100644
--- a/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
@@ -20,13 +20,13 @@ describe 'Dropdown assignee', :js do
 
   describe 'behavior' do
     it 'loads all the assignees when opened' do
-      input_filtered_search('assignee:', submit: false, extra_space: false)
+      input_filtered_search('assignee=', submit: false, extra_space: false)
 
       expect_filtered_search_dropdown_results(filter_dropdown, 2)
     end
 
     it 'shows current user at top of dropdown' do
-      input_filtered_search('assignee:', submit: false, extra_space: false)
+      input_filtered_search('assignee=', submit: false, extra_space: false)
 
       expect(filter_dropdown.first('.filter-dropdown-item')).to have_content(user.name)
     end
@@ -35,7 +35,7 @@ describe 'Dropdown assignee', :js do
   describe 'selecting from dropdown without Ajax call' do
     before do
       Gitlab::Testing::RequestBlockerMiddleware.block_requests!
-      input_filtered_search('assignee:', submit: false, extra_space: false)
+      input_filtered_search('assignee=', submit: false, extra_space: false)
     end
 
     after do
diff --git a/spec/features/issues/filtered_search/dropdown_author_spec.rb b/spec/features/issues/filtered_search/dropdown_author_spec.rb
index 6567bbcf8a2..c95bd7071b3 100644
--- a/spec/features/issues/filtered_search/dropdown_author_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_author_spec.rb
@@ -20,13 +20,13 @@ describe 'Dropdown author', :js do
 
   describe 'behavior' do
     it 'loads all the authors when opened' do
-      input_filtered_search('author:', submit: false, extra_space: false)
+      input_filtered_search('author=', submit: false, extra_space: false)
 
       expect_filtered_search_dropdown_results(filter_dropdown, 2)
     end
 
     it 'shows current user at top of dropdown' do
-      input_filtered_search('author:', submit: false, extra_space: false)
+      input_filtered_search('author=', submit: false, extra_space: false)
 
       expect(filter_dropdown.first('.filter-dropdown-item')).to have_content(user.name)
     end
@@ -35,7 +35,7 @@ describe 'Dropdown author', :js do
   describe 'selecting from dropdown without Ajax call' do
     before do
       Gitlab::Testing::RequestBlockerMiddleware.block_requests!
-      input_filtered_search('author:', submit: false, extra_space: false)
+      input_filtered_search('author=', submit: false, extra_space: false)
     end
 
     after do
diff --git a/spec/features/issues/filtered_search/dropdown_base_spec.rb b/spec/features/issues/filtered_search/dropdown_base_spec.rb
index 0a8d768fe49..2a800f054a0 100644
--- a/spec/features/issues/filtered_search/dropdown_base_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_base_spec.rb
@@ -27,14 +27,14 @@ describe 'Dropdown base', :js do
     it 'shows loading indicator when opened' do
       slow_requests do
         # We aren't using `input_filtered_search` because we want to see the loading indicator
-        filtered_search.set('assignee:')
+        filtered_search.set('assignee=')
 
         expect(page).to have_css("#{js_dropdown_assignee} .filter-dropdown-loading", visible: true)
       end
     end
 
     it 'hides loading indicator when loaded' do
-      input_filtered_search('assignee:', submit: false, extra_space: false)
+      input_filtered_search('assignee=', submit: false, extra_space: false)
 
       expect(find(js_dropdown_assignee)).not_to have_css('.filter-dropdown-loading')
     end
@@ -42,7 +42,7 @@ describe 'Dropdown base', :js do
 
   describe 'caching requests' do
     it 'caches requests after the first load' do
-      input_filtered_search('assignee:', submit: false, extra_space: false)
+      input_filtered_search('assignee=', submit: false, extra_space: false)
       initial_size = dropdown_assignee_size
 
       expect(initial_size).to be > 0
@@ -50,7 +50,7 @@ describe 'Dropdown base', :js do
       new_user = create(:user)
       project.add_maintainer(new_user)
       find('.filtered-search-box .clear-search').click
-      input_filtered_search('assignee:', submit: false, extra_space: false)
+      input_filtered_search('assignee=', submit: false, extra_space: false)
 
       expect(dropdown_assignee_size).to eq(initial_size)
     end
diff --git a/spec/features/issues/filtered_search/dropdown_emoji_spec.rb b/spec/features/issues/filtered_search/dropdown_emoji_spec.rb
index 324f39cbd2c..4c11f83318b 100644
--- a/spec/features/issues/filtered_search/dropdown_emoji_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_emoji_spec.rb
@@ -26,8 +26,8 @@ describe 'Dropdown emoji', :js do
     end
 
     describe 'behavior' do
-      it 'does not open when the search bar has my-reaction:' do
-        filtered_search.set('my-reaction:')
+      it 'does not open when the search bar has my-reaction=' do
+        filtered_search.set('my-reaction=')
 
         expect(page).not_to have_css(js_dropdown_emoji)
       end
@@ -42,20 +42,20 @@ describe 'Dropdown emoji', :js do
     end
 
     describe 'behavior' do
-      it 'opens when the search bar has my-reaction:' do
-        filtered_search.set('my-reaction:')
+      it 'opens when the search bar has my-reaction=' do
+        filtered_search.set('my-reaction=')
 
         expect(page).to have_css(js_dropdown_emoji, visible: true)
       end
 
       it 'loads all the emojis when opened' do
-        input_filtered_search('my-reaction:', submit: false, extra_space: false)
+        input_filtered_search('my-reaction=', submit: false, extra_space: false)
 
         expect_filtered_search_dropdown_results(filter_dropdown, 3)
       end
 
       it 'shows the most populated emoji at top of dropdown' do
-        input_filtered_search('my-reaction:', submit: false, extra_space: false)
+        input_filtered_search('my-reaction=', submit: false, extra_space: false)
 
         expect(first("#{js_dropdown_emoji} .filter-dropdown li")).to have_content(award_emoji_star.name)
       end
diff --git a/spec/features/issues/filtered_search/dropdown_hint_spec.rb b/spec/features/issues/filtered_search/dropdown_hint_spec.rb
index 5994f3a7902..10b092c6957 100644
--- a/spec/features/issues/filtered_search/dropdown_hint_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_hint_spec.rb
@@ -9,11 +9,16 @@ describe 'Dropdown hint', :js do
   let!(:user) { create(:user) }
   let(:filtered_search) { find('.filtered-search') }
   let(:js_dropdown_hint) { '#js-dropdown-hint' }
+  let(:js_dropdown_operator) { '#js-dropdown-operator' }
 
   def click_hint(text)
     find('#js-dropdown-hint .filter-dropdown .filter-dropdown-item', text: text).click
   end
 
+  def click_operator(op)
+    find("#js-dropdown-operator .filter-dropdown .filter-dropdown-item[data-value='#{op}']").click
+  end
+
   before do
     project.add_maintainer(user)
     create(:issue, project: project)
@@ -27,7 +32,7 @@ describe 'Dropdown hint', :js do
 
     it 'does not exist my-reaction dropdown item' do
       expect(page).to have_css(js_dropdown_hint, visible: false)
-      expect(page).not_to have_content('my-reaction')
+      expect(page).not_to have_content('My-reaction')
     end
   end
 
@@ -54,15 +59,6 @@ describe 'Dropdown hint', :js do
     end
 
     describe 'filtering' do
-      it 'does not filter `Press Enter or click to search`' do
-        filtered_search.set('randomtext')
-
-        hint_dropdown = find(js_dropdown_hint)
-
-        expect(hint_dropdown).to have_content('Press Enter or click to search')
-        expect(hint_dropdown).to have_selector('.filter-dropdown .filter-dropdown-item', count: 0)
-      end
-
       it 'filters with text' do
         filtered_search.set('a')
 
@@ -76,21 +72,27 @@ describe 'Dropdown hint', :js do
       end
 
       it 'opens the token dropdown when you click on it' do
-        click_hint('author')
+        click_hint('Author')
 
         expect(page).to have_css(js_dropdown_hint, visible: false)
+        expect(page).to have_css(js_dropdown_operator, visible: true)
+
+        click_operator('=')
+
+        expect(page).to have_css(js_dropdown_hint, visible: false)
+        expect(page).to have_css(js_dropdown_operator, visible: false)
         expect(page).to have_css('#js-dropdown-author', visible: true)
-        expect_tokens([{ name: 'Author' }])
+        expect_tokens([{ name: 'Author', operator: '=' }])
         expect_filtered_search_input_empty
       end
     end
 
     describe 'reselecting from dropdown' do
       it 'reuses existing token text' do
-        filtered_search.send_keys('author:')
+        filtered_search.send_keys('author')
         filtered_search.send_keys(:backspace)
         filtered_search.send_keys(:backspace)
-        click_hint('author')
+        click_hint('Author')
 
         expect_tokens([{ name: 'Author' }])
         expect_filtered_search_input_empty
diff --git a/spec/features/issues/filtered_search/dropdown_label_spec.rb b/spec/features/issues/filtered_search/dropdown_label_spec.rb
index 45112b01eac..1e90efc8d56 100644
--- a/spec/features/issues/filtered_search/dropdown_label_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_label_spec.rb
@@ -21,7 +21,7 @@ describe 'Dropdown label', :js do
   describe 'behavior' do
     it 'loads all the labels when opened' do
       create(:label, project: project, title: 'bug-label')
-      filtered_search.set('label:')
+      filtered_search.set('label=')
 
       expect_filtered_search_dropdown_results(filter_dropdown, 1)
     end
diff --git a/spec/features/issues/filtered_search/dropdown_milestone_spec.rb b/spec/features/issues/filtered_search/dropdown_milestone_spec.rb
index 2f18aa8abaa..1f62a8e0c8d 100644
--- a/spec/features/issues/filtered_search/dropdown_milestone_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_milestone_spec.rb
@@ -23,7 +23,7 @@ describe 'Dropdown milestone', :js do
 
   describe 'behavior' do
     before do
-      filtered_search.set('milestone:')
+      filtered_search.set('milestone=')
     end
 
     it 'loads all the milestones when opened' do
diff --git a/spec/features/issues/filtered_search/dropdown_release_spec.rb b/spec/features/issues/filtered_search/dropdown_release_spec.rb
index b9cce5c6998..fd0a98f9ddc 100644
--- a/spec/features/issues/filtered_search/dropdown_release_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_release_spec.rb
@@ -23,7 +23,7 @@ describe 'Dropdown release', :js do
 
   describe 'behavior' do
     before do
-      filtered_search.set('release:')
+      filtered_search.set('release=')
     end
 
     it 'loads all the releases when opened' do
diff --git a/spec/features/issues/filtered_search/filter_issues_spec.rb b/spec/features/issues/filtered_search/filter_issues_spec.rb
index 12e010e293a..c99c205d5da 100644
--- a/spec/features/issues/filtered_search/filter_issues_spec.rb
+++ b/spec/features/issues/filtered_search/filter_issues_spec.rb
@@ -67,7 +67,7 @@ describe 'Filter issues', :js do
   it 'filters by all available tokens' do
     search_term = 'issue'
 
-    input_filtered_search("assignee:@#{user.username} author:@#{user.username} label:~#{caps_sensitive_label.title} milestone:%#{milestone.title} #{search_term}")
+    input_filtered_search("assignee=@#{user.username} author=@#{user.username} label=~#{caps_sensitive_label.title} milestone=%#{milestone.title} #{search_term}")
 
     wait_for_requests
 
@@ -84,7 +84,7 @@ describe 'Filter issues', :js do
   describe 'filter issues by author' do
     context 'only author' do
       it 'filters issues by searched author' do
-        input_filtered_search("author:@#{user.username}")
+        input_filtered_search("author=@#{user.username}")
 
         wait_for_requests
 
@@ -98,7 +98,7 @@ describe 'Filter issues', :js do
   describe 'filter issues by assignee' do
     context 'only assignee' do
       it 'filters issues by searched assignee' do
-        input_filtered_search("assignee:@#{user.username}")
+        input_filtered_search("assignee=@#{user.username}")
 
         wait_for_requests
 
@@ -108,7 +108,7 @@ describe 'Filter issues', :js do
       end
 
       it 'filters issues by no assignee' do
-        input_filtered_search('assignee:none')
+        input_filtered_search('assignee=none')
 
         expect_tokens([assignee_token('None')])
         expect_issues_list_count(3)
@@ -122,7 +122,7 @@ describe 'Filter issues', :js do
       it 'filters issues by multiple assignees' do
         create(:issue, project: project, author: user, assignees: [user2, user])
 
-        input_filtered_search("assignee:@#{user.username} assignee:@#{user2.username}")
+        input_filtered_search("assignee=@#{user.username} assignee=@#{user2.username}")
 
         expect_tokens([
           assignee_token(user.name),
@@ -138,15 +138,31 @@ describe 'Filter issues', :js do
   describe 'filter issues by label' do
     context 'only label' do
       it 'filters issues by searched label' do
-        input_filtered_search("label:~#{bug_label.title}")
+        input_filtered_search("label=~#{bug_label.title}")
 
         expect_tokens([label_token(bug_label.title)])
         expect_issues_list_count(2)
         expect_filtered_search_input_empty
       end
 
+      it 'filters issues not containing searched label' do
+        input_filtered_search("label!=~#{bug_label.title}")
+
+        expect_tokens([label_token(bug_label.title)])
+        expect_issues_list_count(6)
+        expect_filtered_search_input_empty
+      end
+
+      it 'filters issues by no label' do
+        input_filtered_search('label=none')
+
+        expect_tokens([label_token('None', false)])
+        expect_issues_list_count(4)
+        expect_filtered_search_input_empty
+      end
+
       it 'filters issues by no label' do
-        input_filtered_search('label:none')
+        input_filtered_search('label!=none')
 
         expect_tokens([label_token('None', false)])
         expect_issues_list_count(4)
@@ -154,7 +170,18 @@ describe 'Filter issues', :js do
       end
 
       it 'filters issues by multiple labels' do
-        input_filtered_search("label:~#{bug_label.title} label:~#{caps_sensitive_label.title}")
+        input_filtered_search("label=~#{bug_label.title} label=~#{caps_sensitive_label.title}")
+
+        expect_tokens([
+          label_token(bug_label.title),
+          label_token(caps_sensitive_label.title)
+        ])
+        expect_issues_list_count(1)
+        expect_filtered_search_input_empty
+      end
+
+      it 'filters issues by multiple labels with not operator' do
+        input_filtered_search("label!=~#{bug_label.title} label=~#{caps_sensitive_label.title}")
 
         expect_tokens([
           label_token(bug_label.title),
@@ -169,22 +196,42 @@ describe 'Filter issues', :js do
         special_issue = create(:issue, title: "Issue with special character label", project: project)
         special_issue.labels << special_label
 
-        input_filtered_search("label:~#{special_label.title}")
+        input_filtered_search("label=~#{special_label.title}")
 
         expect_tokens([label_token(special_label.title)])
         expect_issues_list_count(1)
         expect_filtered_search_input_empty
       end
 
+      it 'filters issues by label not containing special characters' do
+        special_label = create(:label, project: project, title: '!@#{$%^&*()-+[]<>?/:{}|\}')
+        special_issue = create(:issue, title: "Issue with special character label", project: project)
+        special_issue.labels << special_label
+
+        input_filtered_search("label!=~#{special_label.title}")
+
+        expect_tokens([label_token(special_label.title)])
+        expect_issues_list_count(8)
+        expect_filtered_search_input_empty
+      end
+
       it 'does not show issues for unused labels' do
         new_label = create(:label, project: project, title: 'new_label')
 
-        input_filtered_search("label:~#{new_label.title}")
+        input_filtered_search("label=~#{new_label.title}")
 
         expect_tokens([label_token(new_label.title)])
         expect_no_issues_list
         expect_filtered_search_input_empty
       end
+
+      it 'does show issues for bug label' do
+        input_filtered_search("label!=~#{bug_label.title}")
+
+        expect_tokens([label_token(bug_label.title)])
+        expect_issues_list_count(6)
+        expect_filtered_search_input_empty
+      end
     end
 
     context 'label with multiple words' do
@@ -193,7 +240,7 @@ describe 'Filter issues', :js do
         special_multiple_issue = create(:issue, title: "Issue with special character multiple words label", project: project)
         special_multiple_issue.labels << special_multiple_label
 
-        input_filtered_search("label:~'#{special_multiple_label.title}'")
+        input_filtered_search("label=~'#{special_multiple_label.title}'")
 
         # Check for search results (which makes sure that the page has changed)
         expect_issues_list_count(1)
@@ -205,7 +252,7 @@ describe 'Filter issues', :js do
       end
 
       it 'single quotes' do
-        input_filtered_search("label:~'#{multiple_words_label.title}'")
+        input_filtered_search("label=~'#{multiple_words_label.title}'")
 
         expect_issues_list_count(1)
         expect_tokens([label_token("\"#{multiple_words_label.title}\"")])
@@ -213,7 +260,7 @@ describe 'Filter issues', :js do
       end
 
       it 'double quotes' do
-        input_filtered_search("label:~\"#{multiple_words_label.title}\"")
+        input_filtered_search("label=~\"#{multiple_words_label.title}\"")
 
         expect_tokens([label_token("\"#{multiple_words_label.title}\"")])
         expect_issues_list_count(1)
@@ -225,7 +272,7 @@ describe 'Filter issues', :js do
         double_quotes_label_issue = create(:issue, title: "Issue with double quotes label", project: project)
         double_quotes_label_issue.labels << double_quotes_label
 
-        input_filtered_search("label:~'#{double_quotes_label.title}'")
+        input_filtered_search("label=~'#{double_quotes_label.title}'")
 
         expect_tokens([label_token("'#{double_quotes_label.title}'")])
         expect_issues_list_count(1)
@@ -237,7 +284,7 @@ describe 'Filter issues', :js do
         single_quotes_label_issue = create(:issue, title: "Issue with single quotes label", project: project)
         single_quotes_label_issue.labels << single_quotes_label
 
-        input_filtered_search("label:~\"#{single_quotes_label.title}\"")
+        input_filtered_search("label=~\"#{single_quotes_label.title}\"")
 
         expect_tokens([label_token("\"#{single_quotes_label.title}\"")])
         expect_issues_list_count(1)
@@ -249,7 +296,7 @@ describe 'Filter issues', :js do
       it 'filters issues by searched label, label2, author, assignee, milestone and text' do
         search_term = 'bug'
 
-        input_filtered_search("label:~#{bug_label.title} label:~#{caps_sensitive_label.title} author:@#{user.username} assignee:@#{user.username} milestone:%#{milestone.title} #{search_term}")
+        input_filtered_search("label=~#{bug_label.title} label=~#{caps_sensitive_label.title} author=@#{user.username} assignee=@#{user.username} milestone=%#{milestone.title} #{search_term}")
 
         wait_for_requests
 
@@ -263,6 +310,24 @@ describe 'Filter issues', :js do
         expect_issues_list_count(1)
         expect_filtered_search_input(search_term)
       end
+
+      it 'filters issues by searched label, label2, author, assignee, not included in a milestone' do
+        search_term = 'bug'
+
+        input_filtered_search("label=~#{bug_label.title} label=~#{caps_sensitive_label.title} author=@#{user.username} assignee=@#{user.username} milestone!=%#{milestone.title} #{search_term}")
+
+        wait_for_requests
+
+        expect_tokens([
+          label_token(bug_label.title),
+          label_token(caps_sensitive_label.title),
+          author_token(user.name),
+          assignee_token(user.name),
+          milestone_token(milestone.title, false, '!=')
+        ])
+        expect_issues_list_count(0)
+        expect_filtered_search_input(search_term)
+      end
     end
 
     context 'issue label clicked' do
@@ -279,7 +344,7 @@ describe 'Filter issues', :js do
   describe 'filter issues by milestone' do
     context 'only milestone' do
       it 'filters issues by searched milestone' do
-        input_filtered_search("milestone:%#{milestone.title}")
+        input_filtered_search("milestone=%#{milestone.title}")
 
         expect_tokens([milestone_token(milestone.title)])
         expect_issues_list_count(5)
@@ -287,53 +352,102 @@ describe 'Filter issues', :js do
       end
 
       it 'filters issues by no milestone' do
-        input_filtered_search("milestone:none")
+        input_filtered_search("milestone=none")
 
         expect_tokens([milestone_token('None', false)])
         expect_issues_list_count(3)
         expect_filtered_search_input_empty
       end
 
+      it 'filters issues by negation of no milestone' do
+        input_filtered_search("milestone!=none ")
+
+        expect_tokens([milestone_token('None', false, '!=')])
+        expect_issues_list_count(5)
+        expect_filtered_search_input_empty
+      end
+
       it 'filters issues by upcoming milestones' do
         create(:milestone, project: project, due_date: 1.month.from_now) do |future_milestone|
           create(:issue, project: project, milestone: future_milestone, author: user)
         end
 
-        input_filtered_search("milestone:upcoming")
+        input_filtered_search("milestone=upcoming")
 
         expect_tokens([milestone_token('Upcoming', false)])
         expect_issues_list_count(1)
         expect_filtered_search_input_empty
       end
 
+      it 'filters issues by negation of upcoming milestones' do
+        create(:milestone, project: project, due_date: 1.month.from_now) do |future_milestone|
+          create(:issue, project: project, milestone: future_milestone, author: user)
+        end
+
+        input_filtered_search("milestone!=upcoming")
+
+        expect_tokens([milestone_token('Upcoming', false, '!=')])
+        expect_issues_list_count(8)
+        expect_filtered_search_input_empty
+      end
+
       it 'filters issues by started milestones' do
-        input_filtered_search("milestone:started")
+        input_filtered_search("milestone=started")
 
         expect_tokens([milestone_token('Started', false)])
         expect_issues_list_count(5)
         expect_filtered_search_input_empty
       end
 
+      it 'filters issues by negation of started milestones' do
+        input_filtered_search("milestone!=started")
+
+        expect_tokens([milestone_token('Started', false, '!=')])
+        expect_issues_list_count(3)
+        expect_filtered_search_input_empty
+      end
+
       it 'filters issues by milestone containing special characters' do
         special_milestone = create(:milestone, title: '!@\#{$%^&*()}', project: project)
         create(:issue, project: project, milestone: special_milestone)
 
-        input_filtered_search("milestone:%#{special_milestone.title}")
+        input_filtered_search("milestone=%#{special_milestone.title}")
 
         expect_tokens([milestone_token(special_milestone.title)])
         expect_issues_list_count(1)
         expect_filtered_search_input_empty
       end
 
+      it 'filters issues by milestone not containing special characters' do
+        special_milestone = create(:milestone, title: '!@\#{$%^&*()}', project: project)
+        create(:issue, project: project, milestone: special_milestone)
+
+        input_filtered_search("milestone!=%#{special_milestone.title}")
+
+        expect_tokens([milestone_token(special_milestone.title, false, '!=')])
+        expect_issues_list_count(8)
+        expect_filtered_search_input_empty
+      end
+
       it 'does not show issues for unused milestones' do
         new_milestone = create(:milestone, title: 'new', project: project)
 
-        input_filtered_search("milestone:%#{new_milestone.title}")
+        input_filtered_search("milestone=%#{new_milestone.title}")
 
         expect_tokens([milestone_token(new_milestone.title)])
         expect_no_issues_list
         expect_filtered_search_input_empty
       end
+
+      it 'show issues for unused milestones' do
+        new_milestone = create(:milestone, title: 'new', project: project)
+
+        input_filtered_search("milestone!=%#{new_milestone.title}")
+
+        expect_tokens([milestone_token(new_milestone.title, false, '!=')])
+        expect_issues_list_count(8)
+        expect_filtered_search_input_empty
+      end
     end
   end
 
@@ -407,7 +521,7 @@ describe 'Filter issues', :js do
 
     context 'searched text with other filters' do
       it 'filters issues by searched text, author, text, assignee, text, label1, text, label2, text, milestone and text' do
-        input_filtered_search("bug author:@#{user.username} report label:~#{bug_label.title} label:~#{caps_sensitive_label.title} milestone:%#{milestone.title} foo")
+        input_filtered_search("bug author=@#{user.username} report label=~#{bug_label.title} label=~#{caps_sensitive_label.title} milestone=%#{milestone.title} foo")
 
         expect_issues_list_count(1)
         expect_filtered_search_input('bug report foo')
@@ -481,7 +595,7 @@ describe 'Filter issues', :js do
     end
 
     it 'milestone dropdown loads milestones' do
-      input_filtered_search("milestone:", submit: false)
+      input_filtered_search("milestone=", submit: false)
 
       within('#js-dropdown-milestone') do
         expect(page).to have_selector('.filter-dropdown .filter-dropdown-item', count: 1)
@@ -489,7 +603,7 @@ describe 'Filter issues', :js do
     end
 
     it 'label dropdown load labels' do
-      input_filtered_search("label:", submit: false)
+      input_filtered_search("label=", submit: false)
 
       within('#js-dropdown-label') do
         expect(page).to have_selector('.filter-dropdown .filter-dropdown-item', count: 3)
diff --git a/spec/features/issues/filtered_search/recent_searches_spec.rb b/spec/features/issues/filtered_search/recent_searches_spec.rb
index c038281d825..e05c7aa3af5 100644
--- a/spec/features/issues/filtered_search/recent_searches_spec.rb
+++ b/spec/features/issues/filtered_search/recent_searches_spec.rb
@@ -41,8 +41,8 @@ describe 'Recent searches', :js do
 
     items = all('.filtered-search-history-dropdown-item', visible: false, count: 2)
 
-    expect(items[0].text).to eq('label: ~qux garply')
-    expect(items[1].text).to eq('label: ~foo bar')
+    expect(items[0].text).to eq('label: = ~qux garply')
+    expect(items[1].text).to eq('label: = ~foo bar')
   end
 
   it 'saved recent searches are restored last on the list' do
diff --git a/spec/features/issues/filtered_search/search_bar_spec.rb b/spec/features/issues/filtered_search/search_bar_spec.rb
index e97314e02e6..ad994270218 100644
--- a/spec/features/issues/filtered_search/search_bar_spec.rb
+++ b/spec/features/issues/filtered_search/search_bar_spec.rb
@@ -34,7 +34,7 @@ describe 'Search bar', :js do
     it 'selects item' do
       filtered_search.native.send_keys(:down, :down, :enter)
 
-      expect_tokens([author_token])
+      expect_tokens([{ name: 'Assignee' }])
       expect_filtered_search_input_empty
     end
   end
@@ -78,7 +78,7 @@ describe 'Search bar', :js do
       filtered_search.click
       original_size = page.all('#js-dropdown-hint .filter-dropdown .filter-dropdown-item').size
 
-      filtered_search.set('author')
+      filtered_search.set('autho')
 
       expect(find('#js-dropdown-hint')).to have_selector('.filter-dropdown .filter-dropdown-item', count: 1)
 
diff --git a/spec/features/issues/filtered_search/visual_tokens_spec.rb b/spec/features/issues/filtered_search/visual_tokens_spec.rb
index d1e976c3bca..2af2e096bcc 100644
--- a/spec/features/issues/filtered_search/visual_tokens_spec.rb
+++ b/spec/features/issues/filtered_search/visual_tokens_spec.rb
@@ -36,8 +36,9 @@ describe 'Visual tokens', :js do
 
   describe 'editing a single token' do
     before do
-      input_filtered_search('author:@root assignee:none', submit: false)
+      input_filtered_search('author=@root assignee=none', submit: false)
       first('.tokens-container .filtered-search-token').click
+      wait_for_requests
     end
 
     it 'opens author dropdown' do
@@ -76,8 +77,8 @@ describe 'Visual tokens', :js do
 
   describe 'editing multiple tokens' do
     before do
-      input_filtered_search('author:@root assignee:none', submit: false)
-      first('.tokens-container .filtered-search-token').double_click
+      input_filtered_search('author=@root assignee=none', submit: false)
+      first('.tokens-container .filtered-search-token').click
     end
 
     it 'opens author dropdown' do
@@ -85,27 +86,33 @@ describe 'Visual tokens', :js do
     end
 
     it 'opens assignee dropdown' do
-      find('.tokens-container .filtered-search-token', text: 'Assignee').double_click
+      find('.tokens-container .filtered-search-token', text: 'Assignee').click
       expect(page).to have_css('#js-dropdown-assignee', visible: true)
     end
   end
 
   describe 'editing a search term while editing another filter token' do
     before do
-      input_filtered_search('author assignee:', submit: false)
-      first('.tokens-container .filtered-search-term').double_click
+      input_filtered_search('foo assignee=', submit: false)
+      first('.tokens-container .filtered-search-term').click
     end
 
     it 'opens author dropdown' do
-      find('#js-dropdown-hint .filter-dropdown .filter-dropdown-item', text: 'author').click
+      find('#js-dropdown-hint .filter-dropdown .filter-dropdown-item', text: 'Author').click
+
+      expect(page).to have_css('#js-dropdown-operator', visible: true)
+      expect(page).to have_css('#js-dropdown-author', visible: false)
+
+      find('#js-dropdown-operator .filter-dropdown .filter-dropdown-item[data-value="="]').click
 
+      expect(page).to have_css('#js-dropdown-operator', visible: false)
       expect(page).to have_css('#js-dropdown-author', visible: true)
     end
   end
 
   describe 'add new token after editing existing token' do
     before do
-      input_filtered_search('author:@root assignee:none', submit: false)
+      input_filtered_search('author=@root assignee=none', submit: false)
       first('.tokens-container .filtered-search-token').double_click
       filtered_search.send_keys(' ')
     end
@@ -116,7 +123,7 @@ describe 'Visual tokens', :js do
       end
 
       it 'opens token dropdown' do
-        filtered_search.send_keys('author:')
+        filtered_search.send_keys('author=')
 
         expect(page).to have_css('#js-dropdown-author', visible: true)
       end
@@ -124,7 +131,7 @@ describe 'Visual tokens', :js do
 
     describe 'visual tokens' do
       it 'creates visual token' do
-        filtered_search.send_keys('author:@thomas ')
+        filtered_search.send_keys('author=@thomas ')
         token = page.all('.tokens-container .filtered-search-token')[1]
 
         expect(token.find('.name').text).to eq('Author')
@@ -133,7 +140,7 @@ describe 'Visual tokens', :js do
     end
 
     it 'does not tokenize incomplete token' do
-      filtered_search.send_keys('author:')
+      filtered_search.send_keys('author=')
 
       find('body').click
       token = page.all('.tokens-container .js-visual-token')[1]
@@ -145,7 +152,7 @@ describe 'Visual tokens', :js do
 
   describe 'search using incomplete visual tokens' do
     before do
-      input_filtered_search('author:@root assignee:none', extra_space: false)
+      input_filtered_search('author=@root assignee=none', extra_space: false)
     end
 
     it 'tokenizes the search term to complete visual token' do