1 files changed, 15 insertions, 18 deletions

diff --git a/spec/features/issues/filtered_search/dropdown_label_spec.rb b/spec/features/issues/filtered_search/dropdown_label_spec.rb
index b192064b693..abe5d61e38c 100644
--- a/spec/features/issues/filtered_search/dropdown_label_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_label_spec.rb
@@ -28,12 +28,8 @@ describe 'Dropdown label', js: true, feature: true do
     filter_dropdown.find('.filter-dropdown-item', text: text).click
   end
 
-  def dropdown_label_size
-    filter_dropdown.all('.filter-dropdown-item').size
-  end
-
   def clear_search_field
-    find('.filtered-search-input-container .clear-search').click
+    find('.filtered-search-box .clear-search').click
   end
 
   before do
@@ -81,7 +77,7 @@ describe 'Dropdown label', js: true, feature: true do
       filtered_search.set('label:')
 
       expect(filter_dropdown).to have_content(bug_label.title)
-      expect(dropdown_label_size).to eq(1)
+      expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1)
     end
   end
 
@@ -97,7 +93,8 @@ describe 'Dropdown label', js: true, feature: true do
 
       expect(filter_dropdown.find('.filter-dropdown-item', text: bug_label.title)).to be_visible
       expect(filter_dropdown.find('.filter-dropdown-item', text: uppercase_label.title)).to be_visible
-      expect(dropdown_label_size).to eq(2)
+
+      expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 2)
 
       clear_search_field
       init_label_search
@@ -106,14 +103,14 @@ describe 'Dropdown label', js: true, feature: true do
 
       expect(filter_dropdown.find('.filter-dropdown-item', text: bug_label.title)).to be_visible
       expect(filter_dropdown.find('.filter-dropdown-item', text: uppercase_label.title)).to be_visible
-      expect(dropdown_label_size).to eq(2)
+      expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 2)
     end
 
     it 'filters by multiple words with or without symbol' do
       filtered_search.send_keys('Hig')
 
       expect(filter_dropdown.find('.filter-dropdown-item', text: two_words_label.title)).to be_visible
-      expect(dropdown_label_size).to eq(1)
+      expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1)
 
       clear_search_field
       init_label_search
@@ -121,14 +118,14 @@ describe 'Dropdown label', js: true, feature: true do
       filtered_search.send_keys('~Hig')
 
       expect(filter_dropdown.find('.filter-dropdown-item', text: two_words_label.title)).to be_visible
-      expect(dropdown_label_size).to eq(1)
+      expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1)
     end
 
     it 'filters by multiple words containing single quotes with or without symbol' do
       filtered_search.send_keys('won\'t')
 
       expect(filter_dropdown.find('.filter-dropdown-item', text: wont_fix_single_label.title)).to be_visible
-      expect(dropdown_label_size).to eq(1)
+      expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1)
 
       clear_search_field
       init_label_search
@@ -136,14 +133,14 @@ describe 'Dropdown label', js: true, feature: true do
       filtered_search.send_keys('~won\'t')
 
       expect(filter_dropdown.find('.filter-dropdown-item', text: wont_fix_single_label.title)).to be_visible
-      expect(dropdown_label_size).to eq(1)
+      expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1)
     end
 
     it 'filters by multiple words containing double quotes with or without symbol' do
       filtered_search.send_keys('won"t')
 
       expect(filter_dropdown.find('.filter-dropdown-item', text: wont_fix_label.title)).to be_visible
-      expect(dropdown_label_size).to eq(1)
+      expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1)
 
       clear_search_field
       init_label_search
@@ -151,14 +148,14 @@ describe 'Dropdown label', js: true, feature: true do
       filtered_search.send_keys('~won"t')
 
       expect(filter_dropdown.find('.filter-dropdown-item', text: wont_fix_label.title)).to be_visible
-      expect(dropdown_label_size).to eq(1)
+      expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1)
     end
 
     it 'filters by special characters with or without symbol' do
       filtered_search.send_keys('^+')
 
       expect(filter_dropdown.find('.filter-dropdown-item', text: special_label.title)).to be_visible
-      expect(dropdown_label_size).to eq(1)
+      expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1)
 
       clear_search_field
       init_label_search
@@ -166,7 +163,7 @@ describe 'Dropdown label', js: true, feature: true do
       filtered_search.send_keys('~^+')
 
       expect(filter_dropdown.find('.filter-dropdown-item', text: special_label.title)).to be_visible
-      expect(dropdown_label_size).to eq(1)
+      expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1)
     end
   end
 
@@ -280,13 +277,13 @@ describe 'Dropdown label', js: true, feature: true do
       create(:label, project: project, title: 'bug-label')
       init_label_search
 
-      expect(dropdown_label_size).to eq(1)
+      expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1)
 
       create(:label, project: project)
       clear_search_field
       init_label_search
 
-      expect(dropdown_label_size).to eq(1)
+      expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1)
     end
   end
 end