Merge branch 'shl-fix-2fa-e2e-tests' into 'master'

Fix 2FA e2e tests by setting user password

See merge request gitlab-org/gitlab!71528

qa/qa/page/profile/two_factor_auth.rb

@@ -11,6 +11,7 @@ module QA
         view 'app/views/profiles/two_factor_auths/show.html.haml' do
           element :otp_secret_content
           element :pin_code_field
+          element :current_password_field
           element :register_2fa_app_button
         end
 
@@ -33,6 +34,10 @@ module QA
           fill_element(:pin_code_field, pin_code)
         end
 
+        def set_current_password(password)
+          fill_element(:current_password_field, password)
+        end
+
         def click_register_2fa_app_button
           click_element :register_2fa_app_button
         end

qa/qa/specs/features/browser_ui/1_manage/login/2fa_recovery_spec.rb

@@ -78,6 +78,7 @@ module QA
             @otp = QA::Support::OTP.new(two_fa_auth.otp_secret_content)
 
             two_fa_auth.set_pin_code(@otp.fresh_otp)
+            two_fa_auth.set_current_password(user.password)
             two_fa_auth.click_register_2fa_app_button
 
             recovery_code = two_fa_auth.recovery_codes.sample

qa/qa/specs/features/browser_ui/1_manage/login/2fa_ssh_recovery_spec.rb

@@ -55,6 +55,7 @@ module QA
           Page::Profile::TwoFactorAuth.perform do |two_fa_auth|
             otp = QA::Support::OTP.new(two_fa_auth.otp_secret_content)
             two_fa_auth.set_pin_code(otp.fresh_otp)
+            two_fa_auth.set_current_password(user.password)
             two_fa_auth.click_register_2fa_app_button
             two_fa_auth.click_copy_and_proceed
           end

qa/qa/specs/features/browser_ui/1_manage/login/log_in_with_2fa_spec.rb

@@ -98,6 +98,7 @@ module QA
             @otp = QA::Support::OTP.new(two_fa_auth.otp_secret_content)
 
             two_fa_auth.set_pin_code(@otp.fresh_otp)
+            two_fa_auth.set_current_password(user.password)
             two_fa_auth.click_register_2fa_app_button
 
             two_fa_auth.click_copy_and_proceed