1 files changed, 6 insertions, 2 deletions
diff --git a/spec/features/projects/compare_spec.rb b/spec/features/projects/compare_spec.rb
index b2a3b111c9e..4162f2579d1 100644
--- a/spec/features/projects/compare_spec.rb
+++ b/spec/features/projects/compare_spec.rb
@@ -52,8 +52,12 @@ describe "Compare", js: true do
   def select_using_dropdown(dropdown_type, selection)
     dropdown = find(".js-compare-#{dropdown_type}-dropdown")
     dropdown.find(".compare-dropdown-toggle").click
+    # find input before using to wait for the inputs visiblity
+    dropdown.find('.dropdown-menu')
     dropdown.fill_in("Filter by Git revision", with: selection)
-    wait_for_ajax
-    dropdown.find_all("a[data-ref=\"#{selection}\"]", visible: true).last.click
+    wait_for_requests
+    # find before all to wait for the items visiblity
+    dropdown.find("a[data-ref=\"#{selection}\"]", match: :first)
+    dropdown.all("a[data-ref=\"#{selection}\"]").last.click
   end
 end