Merge branch 'rs-rename-login_as' into 'master'

Except where necessary, use `sign_in` over `login_as` in features

See merge request !10320

2 files changed, 4 insertions, 5 deletions

diff --git a/spec/support/login_helpers.rb b/spec/support/login_helpers.rb
index 9ffb00be0b8..e6da852e728 100644
--- a/spec/support/login_helpers.rb
+++ b/spec/support/login_helpers.rb
@@ -84,8 +84,4 @@ module LoginHelpers
   def logout_direct
     page.driver.submit :delete, '/users/sign_out', {}
   end
-
-  def skip_ci_admin_auth
-    allow_any_instance_of(Ci::Admin::ApplicationController).to receive_messages(authenticate_admin!: true)
-  end
 end
diff --git a/spec/support/wait_for_ajax.rb b/spec/support/wait_for_ajax.rb
index 0f9dc2dee75..508de2ee8e1 100644
--- a/spec/support/wait_for_ajax.rb
+++ b/spec/support/wait_for_ajax.rb
@@ -6,10 +6,13 @@ module WaitForAjax
   end
 
   def finished_all_ajax_requests?
+    return true unless javascript_test?
+    return true if page.evaluate_script('typeof jQuery === "undefined"')
+
     page.evaluate_script('jQuery.active').zero?
   end
 
   def javascript_test?
-    [:selenium, :webkit, :chrome, :poltergeist].include?(Capybara.current_driver)
+    Capybara.current_driver == Capybara.javascript_driver
   end
 end