1 files changed, 14 insertions, 13 deletions

diff --git a/spec/features/issues/filtered_search/search_bar_spec.rb b/spec/features/issues/filtered_search/search_bar_spec.rb
index 59244d65eec..3ea95aed0a6 100644
--- a/spec/features/issues/filtered_search/search_bar_spec.rb
+++ b/spec/features/issues/filtered_search/search_bar_spec.rb
@@ -2,7 +2,6 @@ require 'rails_helper'
 
 describe 'Search bar', js: true, feature: true do
   include FilteredSearchHelpers
-  include WaitForAjax
 
   let!(:project) { create(:empty_project) }
   let!(:user) { create(:user) }
@@ -26,7 +25,7 @@ describe 'Search bar', js: true, feature: true do
       filtered_search.native.send_keys(:down)
 
       page.within '#js-dropdown-hint' do
-        expect(page).to have_selector('.dropdown-active')
+        expect(page).to have_selector('.droplab-item-active')
       end
     end
 
@@ -44,7 +43,7 @@ describe 'Search bar', js: true, feature: true do
       filtered_search.set(search_text)
 
       expect(filtered_search.value).to eq(search_text)
-      find('.filtered-search-input-container .clear-search').click
+      find('.filtered-search-box .clear-search').click
 
       expect(filtered_search.value).to eq('')
     end
@@ -55,7 +54,7 @@ describe 'Search bar', js: true, feature: true do
 
     it 'hides after clicked' do
       filtered_search.set('a')
-      find('.filtered-search-input-container .clear-search').click
+      find('.filtered-search-box .clear-search').click
 
       expect(page).to have_css('.clear-search', visible: false)
     end
@@ -79,28 +78,30 @@ describe 'Search bar', js: true, feature: true do
 
       filtered_search.set('author')
 
-      expect(page.all('#js-dropdown-hint .filter-dropdown .filter-dropdown-item').size).to eq(1)
+      expect(find('#js-dropdown-hint')).to have_selector('.filter-dropdown .filter-dropdown-item', count: 1)
 
-      find('.filtered-search-input-container .clear-search').click
+      find('.filtered-search-box .clear-search').click
       filtered_search.click
 
-      expect(page.all('#js-dropdown-hint .filter-dropdown .filter-dropdown-item').size).to eq(original_size)
+      expect(find('#js-dropdown-hint')).to have_selector('.filter-dropdown .filter-dropdown-item', count: original_size)
     end
 
     it 'resets the dropdown filters' do
+      filtered_search.click
+
+      hint_offset = get_left_style(find('#js-dropdown-hint')['style'])
+
       filtered_search.set('a')
-      hint_style = page.find('#js-dropdown-hint')['style']
-      hint_offset = get_left_style(hint_style)
 
       filtered_search.set('author:')
 
-      expect(page.all('#js-dropdown-hint .filter-dropdown .filter-dropdown-item').size).to eq(0)
+      find('#js-dropdown-hint', visible: false)
 
-      find('.filtered-search-input-container .clear-search').click
+      find('.filtered-search-box .clear-search').click
       filtered_search.click
 
-      expect(page.all('#js-dropdown-hint .filter-dropdown .filter-dropdown-item').size).to be > 0
-      expect(get_left_style(page.find('#js-dropdown-hint')['style'])).to eq(hint_offset)
+      expect(find('#js-dropdown-hint')).to have_selector('.filter-dropdown .filter-dropdown-item', count: 4)
+      expect(get_left_style(find('#js-dropdown-hint')['style'])).to eq(hint_offset)
     end
   end
 end