Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

1 files changed, 36 insertions, 35 deletions

diff --git a/spec/features/users/login_spec.rb b/spec/features/users/login_spec.rb
index 2780549eea1..4d06415e203 100644
--- a/spec/features/users/login_spec.rb
+++ b/spec/features/users/login_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
       expect(user.reset_password_token).not_to be_nil
 
       gitlab_sign_in(user)
-      expect(current_path).to eq root_path
+      expect(page).to have_current_path root_path, ignore_query: true
 
       user.reload
       expect(user.reset_password_token).to be_nil
@@ -46,14 +46,14 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
       user = create(:admin, password_automatically_set: true)
 
       visit root_path
-      expect(current_path).to eq edit_user_password_path
+      expect(page).to have_current_path edit_user_password_path, ignore_query: true
       expect(page).to have_content('Please create a password for your new account.')
 
       fill_in 'user_password',              with: Gitlab::Password.test_default
       fill_in 'user_password_confirmation', with: Gitlab::Password.test_default
       click_button 'Change your password'
 
-      expect(current_path).to eq new_user_session_path
+      expect(page).to have_current_path new_user_session_path, ignore_query: true
       expect(page).to have_content(I18n.t('devise.passwords.updated_not_active'))
 
       fill_in 'user_login',    with: user.username
@@ -61,7 +61,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
       click_button 'Sign in'
 
       expect_single_session_with_authenticated_ttl
-      expect(current_path).to eq root_path
+      expect(page).to have_current_path root_path, ignore_query: true
     end
 
     it 'does not show flash messages when login page' do
@@ -145,7 +145,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
         fill_in 'user_email', with: user.email
         click_button 'Resend'
 
-        expect(current_path).to eq users_almost_there_path
+        expect(page).to have_current_path users_almost_there_path, ignore_query: true
       end
     end
   end
@@ -226,7 +226,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
           enter_code(user.current_otp)
 
           expect_single_session_with_authenticated_ttl
-          expect(current_path).to eq root_path
+          expect(page).to have_current_path root_path, ignore_query: true
         end
 
         it 'persists remember_me value via hidden field' do
@@ -255,7 +255,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
           enter_code(user.current_otp)
 
           expect_single_session_with_authenticated_ttl
-          expect(current_path).to eq root_path
+          expect(page).to have_current_path root_path, ignore_query: true
         end
 
         it 'triggers ActiveSession.cleanup for the user' do
@@ -286,7 +286,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
 
             enter_code(codes.sample)
 
-            expect(current_path).to eq root_path
+            expect(page).to have_current_path root_path, ignore_query: true
           end
 
           it 'invalidates the used code' do
@@ -373,7 +373,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
 
           expect_single_session_with_authenticated_ttl
           expect(page).not_to have_content('Two-Factor Authentication')
-          expect(current_path).to eq root_path
+          expect(page).to have_current_path root_path, ignore_query: true
         end
       end
 
@@ -391,7 +391,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
           enter_code(user.current_otp)
 
           expect_single_session_with_authenticated_ttl
-          expect(current_path).to eq root_path
+          expect(page).to have_current_path root_path, ignore_query: true
         end
       end
 
@@ -412,7 +412,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
         gitlab_sign_in(user)
 
         expect_single_session_with_authenticated_ttl
-        expect(current_path).to eq root_path
+        expect(page).to have_current_path root_path, ignore_query: true
         expect(page).not_to have_content(I18n.t('devise.failure.already_authenticated'))
       end
 
@@ -437,7 +437,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
 
       context 'when the users password is expired' do
         before do
-          user.update!(password_expires_at: Time.parse('2018-05-08 11:29:46 UTC'))
+          user.update!(password_expires_at: Time.zone.parse('2018-05-08 11:29:46 UTC'))
         end
 
         it 'asks for a new password' do
@@ -450,7 +450,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
           fill_in 'user_password', with: Gitlab::Password.test_default
           click_button 'Sign in'
 
-          expect(current_path).to eq(new_profile_password_path)
+          expect(page).to have_current_path(new_profile_password_path, ignore_query: true)
         end
       end
     end
@@ -493,7 +493,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
 
             gitlab_sign_in(user)
 
-            expect(current_path).to eq profile_two_factor_auth_path
+            expect(page).to have_current_path profile_two_factor_auth_path, ignore_query: true
             expect(page).to have_content('The global settings require you to enable Two-Factor Authentication for your account. You need to do this before ')
           end
 
@@ -503,9 +503,9 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
 
             gitlab_sign_in(user)
 
-            expect(current_path).to eq profile_two_factor_auth_path
+            expect(page).to have_current_path profile_two_factor_auth_path, ignore_query: true
             click_link 'Configure it later'
-            expect(current_path).to eq root_path
+            expect(page).to have_current_path root_path, ignore_query: true
           end
         end
 
@@ -518,7 +518,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
 
             gitlab_sign_in(user)
 
-            expect(current_path).to eq profile_two_factor_auth_path
+            expect(page).to have_current_path profile_two_factor_auth_path, ignore_query: true
             expect(page).to have_content(
               'The global settings require you to enable Two-Factor Authentication for your account.'
             )
@@ -530,7 +530,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
 
             gitlab_sign_in(user)
 
-            expect(current_path).to eq profile_two_factor_auth_path
+            expect(page).to have_current_path profile_two_factor_auth_path, ignore_query: true
             expect(page).not_to have_link('Configure it later')
           end
         end
@@ -547,7 +547,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
 
           gitlab_sign_in(user)
 
-          expect(current_path).to eq profile_two_factor_auth_path
+          expect(page).to have_current_path profile_two_factor_auth_path, ignore_query: true
           expect(page).to have_content(
             'The global settings require you to enable Two-Factor Authentication for your account.'
           )
@@ -576,7 +576,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
 
               gitlab_sign_in(user)
 
-              expect(current_path).to eq profile_two_factor_auth_path
+              expect(page).to have_current_path profile_two_factor_auth_path, ignore_query: true
               expect(page).to have_content(
                 'The group settings for Group 1 and Group 2 require you to enable '\
                 'Two-Factor Authentication for your account. '\
@@ -594,9 +594,9 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
 
             gitlab_sign_in(user)
 
-            expect(current_path).to eq profile_two_factor_auth_path
+            expect(page).to have_current_path profile_two_factor_auth_path, ignore_query: true
             click_link 'Configure it later'
-            expect(current_path).to eq root_path
+            expect(page).to have_current_path root_path, ignore_query: true
           end
         end
 
@@ -609,7 +609,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
 
             gitlab_sign_in(user)
 
-            expect(current_path).to eq profile_two_factor_auth_path
+            expect(page).to have_current_path profile_two_factor_auth_path, ignore_query: true
             expect(page).to have_content(
               'The group settings for Group 1 and Group 2 require you to enable ' \
               'Two-Factor Authentication for your account.'
@@ -622,7 +622,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
 
             gitlab_sign_in(user)
 
-            expect(current_path).to eq profile_two_factor_auth_path
+            expect(page).to have_current_path profile_two_factor_auth_path, ignore_query: true
             expect(page).not_to have_link('Configure it later')
           end
         end
@@ -639,7 +639,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
 
           gitlab_sign_in(user)
 
-          expect(current_path).to eq profile_two_factor_auth_path
+          expect(page).to have_current_path profile_two_factor_auth_path, ignore_query: true
           expect(page).to have_content(
             'The group settings for Group 1 and Group 2 require you to enable ' \
             'Two-Factor Authentication for your account. '\
@@ -775,7 +775,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
 
       click_button 'Accept terms'
 
-      expect(current_path).to eq(root_path)
+      expect(page).to have_current_path(root_path, ignore_query: true)
       expect(page).not_to have_content(I18n.t('devise.failure.already_authenticated'))
     end
 
@@ -792,11 +792,12 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
 
       click_button 'Sign in'
 
-      expect(current_path).to eq(root_path)
+      expect(page).to have_current_path(root_path, ignore_query: true)
     end
 
     context 'when 2FA is required for the user' do
       before do
+        stub_feature_flags(mr_attention_requests: false)
         group = create(:group, require_two_factor_authentication: true)
         group.add_developer(user)
       end
@@ -816,7 +817,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
           expect_to_be_on_terms_page
           click_button 'Accept terms'
 
-          expect(current_path).to eq(profile_two_factor_auth_path)
+          expect(page).to have_current_path(profile_two_factor_auth_path, ignore_query: true)
 
           fill_in 'pin_code', with: user.reload.current_otp
           fill_in 'current_password', with: user.password
@@ -825,7 +826,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
           click_button 'Copy codes'
           click_link 'Proceed'
 
-          expect(current_path).to eq(profile_account_path)
+          expect(page).to have_current_path(profile_account_path, ignore_query: true)
           expect(page).to have_content('You have set up 2FA for your account! If you lose access to your 2FA device, you can use your recovery codes to access your account. Alternatively, if you upload an SSH key, you can use that key to generate additional recovery codes.')
         end
       end
@@ -853,14 +854,14 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
           expect_to_be_on_terms_page
           click_button 'Accept terms'
 
-          expect(current_path).to eq(root_path)
+          expect(page).to have_current_path(root_path, ignore_query: true)
         end
       end
     end
 
     context 'when the users password is expired' do
       before do
-        user.update!(password_expires_at: Time.parse('2018-05-08 11:29:46 UTC'))
+        user.update!(password_expires_at: Time.zone.parse('2018-05-08 11:29:46 UTC'))
       end
 
       it 'asks the user to accept the terms before setting a new password' do
@@ -876,7 +877,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
         expect_to_be_on_terms_page
         click_button 'Accept terms'
 
-        expect(current_path).to eq(new_profile_password_path)
+        expect(page).to have_current_path(new_profile_password_path, ignore_query: true)
 
         fill_in 'user_password', with: Gitlab::Password.test_default
         fill_in 'user_new_password', with: 'new password'
@@ -903,7 +904,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
         expect_to_be_on_terms_page
         click_button 'Accept terms'
 
-        expect(current_path).to eq(profile_path)
+        expect(page).to have_current_path(profile_path, ignore_query: true)
 
         fill_in 'Email', with: 'hello@world.com'
 
@@ -931,7 +932,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
 
       gitlab_sign_in(user)
 
-      expect(current_path).to eq root_path
+      expect(page).to have_current_path root_path, ignore_query: true
       expect(page).to have_content("Please check your email (#{user.email}) to verify that you own this address and unlock the power of CI/CD.")
     end
 
@@ -944,7 +945,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
 
           gitlab_sign_in(user)
 
-          expect(current_path).to eq new_user_session_path
+          expect(page).to have_current_path new_user_session_path, ignore_query: true
           expect(page).to have_content(alert_title)
           expect(page).to have_content(alert_message)
           expect(page).to have_link('Resend confirmation email', href: new_user_confirmation_path)