1 files changed, 12 insertions, 12 deletions
diff --git a/spec/features/u2f_spec.rb b/spec/features/u2f_spec.rb
index dc21637967f..02696841628 100644
--- a/spec/features/u2f_spec.rb
+++ b/spec/features/u2f_spec.rb
@@ -25,7 +25,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
     let(:user) { create(:user) }
 
     before do
-      login_as(user)
+      gitlab_sign_in(user)
       user.update_attribute(:otp_required_for_login, true)
     end
 
@@ -96,7 +96,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
       logout
 
       # Second user
-      user = login_as(:user)
+      user = gitlab_sign_in(:user)
       user.update_attribute(:otp_required_for_login, true)
       visit profile_account_path
       manage_two_factor_authentication
@@ -147,7 +147,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
 
     before do
       # Register and logout
-      login_as(user)
+      gitlab_sign_in(user)
       user.update_attribute(:otp_required_for_login, true)
       visit profile_account_path
       manage_two_factor_authentication
@@ -195,7 +195,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
       describe "but not the current user" do
         it "does not allow logging in with that particular device" do
           # Register current user with the different U2F device
-          current_user = login_as(:user)
+          current_user = gitlab_sign_in(:user)
           current_user.update_attribute(:otp_required_for_login, true)
           visit profile_account_path
           manage_two_factor_authentication
@@ -203,7 +203,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
           logout
 
           # Try authenticating user with the old U2F device
-          login_as(current_user)
+          gitlab_sign_in(current_user)
           @u2f_device.respond_to_u2f_authentication
           expect(page).to have_content('We heard back from your U2F device')
           expect(page).to have_content('Authentication via U2F device failed')
@@ -213,7 +213,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
       describe "and also the current user" do
         it "allows logging in with that particular device" do
           # Register current user with the same U2F device
-          current_user = login_as(:user)
+          current_user = gitlab_sign_in(:user)
           current_user.update_attribute(:otp_required_for_login, true)
           visit profile_account_path
           manage_two_factor_authentication
@@ -221,7 +221,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
           logout
 
           # Try authenticating user with the same U2F device
-          login_as(current_user)
+          gitlab_sign_in(current_user)
           @u2f_device.respond_to_u2f_authentication
           expect(page).to have_content('We heard back from your U2F device')
 
@@ -233,7 +233,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
     describe "when a given U2F device has not been registered" do
       it "does not allow logging in with that particular device" do
         unregistered_device = FakeU2fDevice.new(page, 'My device')
-        login_as(user)
+        gitlab_sign_in(user)
         unregistered_device.respond_to_u2f_authentication
         expect(page).to have_content('We heard back from your U2F device')
 
@@ -244,7 +244,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
     describe "when more than one device has been registered by the same user" do
       it "allows logging in with either device" do
         # Register first device
-        user = login_as(:user)
+        user = gitlab_sign_in(:user)
         user.update_attribute(:otp_required_for_login, true)
         visit profile_two_factor_auth_path
         expect(page).to have_content("Your U2F device needs to be set up.")
@@ -258,7 +258,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
 
         # Authenticate as both devices
         [first_device, second_device].each do |device|
-          login_as(user)
+          gitlab_sign_in(user)
           device.respond_to_u2f_authentication
           expect(page).to have_content('We heard back from your U2F device')
 
@@ -273,7 +273,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
       let(:user) { create(:user) }
 
       before do
-        user = login_as(:user)
+        user = gitlab_sign_in(:user)
         user.update_attribute(:otp_required_for_login, true)
         visit profile_account_path
         manage_two_factor_authentication
@@ -300,7 +300,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
 
     before do
       # Register and logout
-      login_as(user)
+      gitlab_sign_in(user)
       user.update_attribute(:otp_required_for_login, true)
       visit profile_account_path
     end