1 files changed, 46 insertions, 27 deletions

diff --git a/spec/features/dashboard/issues_filter_spec.rb b/spec/features/dashboard/issues_filter_spec.rb
index ee1e704c6c4..e67e04ee0b0 100644
--- a/spec/features/dashboard/issues_filter_spec.rb
+++ b/spec/features/dashboard/issues_filter_spec.rb
@@ -6,43 +6,55 @@ RSpec.describe 'Dashboard Issues filtering', :js, feature_category: :team_planni
   include Features::SortingHelpers
   include FilteredSearchHelpers
 
-  let(:user)      { create(:user) }
-  let(:project)   { create(:project) }
-  let(:milestone) { create(:milestone, project: project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:milestone) { create(:milestone, project: project) }
 
-  let!(:issue)  { create(:issue, project: project, author: user, assignees: [user]) }
-  let!(:issue2) { create(:issue, project: project, author: user, assignees: [user], milestone: milestone) }
+  let_it_be(:issue) { create(:issue, project: project, author: user, assignees: [user]) }
+  let_it_be(:issue2) { create(:issue, project: project, author: user, assignees: [user], milestone: milestone) }
+  let_it_be(:label) { create(:label, project: project, title: 'bug') }
+  let_it_be(:label_link) { create(:label_link, label: label, target: issue) }
+
+  let_it_be(:project2) { create(:project, namespace: user.namespace) }
+  let_it_be(:label2) { create(:label, title: 'bug') }
 
   before do
+    project.labels << label
+    project2.labels << label2
     project.add_maintainer(user)
     sign_in(user)
-
-    visit_issues
   end
 
   context 'without any filter' do
     it 'shows error message' do
+      visit issues_dashboard_path
+
       expect(page).to have_content 'Please select at least one filter to see results'
     end
   end
 
   context 'filtering by milestone' do
     it 'shows all issues with no milestone' do
-      input_filtered_search("milestone:=none")
+      visit issues_dashboard_path
+
+      select_tokens 'Milestone', '=', 'None', submit: true
 
       expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1)
       expect(page).to have_selector('.issue', count: 1)
     end
 
     it 'shows all issues with the selected milestone' do
-      input_filtered_search("milestone:=%\"#{milestone.title}\"")
+      visit issues_dashboard_path
+
+      select_tokens 'Milestone', '=', milestone.title, submit: true
 
       expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1)
       expect(page).to have_selector('.issue', count: 1)
     end
 
     it 'updates atom feed link' do
-      visit_issues(milestone_title: '', assignee_username: user.username)
+      visit issues_dashboard_path(milestone_title: '', assignee_username: user.username)
+      click_button 'Actions'
 
       link = find_link('Subscribe to RSS feed')
       params = CGI.parse(URI.parse(link[:href]).query)
@@ -59,40 +71,47 @@ RSpec.describe 'Dashboard Issues filtering', :js, feature_category: :team_planni
   end
 
   context 'filtering by label' do
-    let(:label) { create(:label, project: project) }
-    let!(:label_link) { create(:label_link, label: label, target: issue) }
+    before do
+      visit issues_dashboard_path
+    end
 
     it 'shows all issues with the selected label' do
-      input_filtered_search("label:=~#{label.title}")
+      select_tokens 'Label', '=', label.title, submit: true
 
-      page.within 'ul.content-list' do
-        expect(page).to have_content issue.title
-        expect(page).not_to have_content issue2.title
-      end
+      expect(page).to have_content issue.title
+      expect(page).not_to have_content issue2.title
+    end
+
+    it 'removes duplicate labels' do
+      select_tokens 'Label', '='
+      send_keys 'bu'
+
+      expect_suggestion('bug')
+      expect_suggestion_count(3) # Expect None, Any, and bug
     end
   end
 
   context 'sorting' do
     before do
-      visit_issues(assignee_username: user.username)
+      visit issues_dashboard_path(assignee_username: user.username)
     end
 
     it 'remembers last sorting value' do
-      pajamas_sort_by(s_('SortOptions|Created date'))
-      visit_issues(assignee_username: user.username)
+      click_button 'Created date'
+      click_button 'Updated date'
+
+      visit issues_dashboard_path(assignee_username: user.username)
 
-      expect(page).to have_button('Created date')
+      expect(page).to have_button('Updated date')
     end
 
     it 'keeps sorting issues after visiting Projects Issues page' do
-      pajamas_sort_by(s_('SortOptions|Created date'))
+      click_button 'Created date'
+      click_button 'Due date'
+
       visit project_issues_path(project)
 
-      expect(page).to have_button('Created date')
+      expect(page).to have_button('Due date')
     end
   end
-
-  def visit_issues(...)
-    visit issues_dashboard_path(...)
-  end
 end