Merge branch 'move-two-factor-banner' into 'master'

Move two-factor authentication callout to the todo-list page

See merge request gitlab-org/gitlab!82612

app/views/dashboard/todos/index.html.haml

@@ -2,6 +2,7 @@
 - page_title _("To-Do List")
 - header_title _("To-Do List"), dashboard_todos_path
 
+= render_two_factor_auth_recovery_settings_check
 = render_dashboard_ultimate_trial(current_user)
 - add_page_specific_style 'page_bundles/todos'
 

app/views/layouts/_page.html.haml

@@ -14,7 +14,6 @@
       = dispensable_render "layouts/nav/classification_level_banner"
       = yield :flash_message
       = dispensable_render "shared/service_ping_consent"
-      = render_two_factor_auth_recovery_settings_check
       = dispensable_render_if_exists "layouts/header/ee_subscribable_banner"
       = dispensable_render_if_exists "layouts/header/seats_count_alert"
       = dispensable_render_if_exists "shared/namespace_storage_limit_alert"

app/views/shared/_two_factor_auth_recovery_settings_check.html.haml

 = render 'shared/global_alert',
   variant: :warning,
-  alert_class: 'js-recovery-settings-callout',
+  alert_class: 'js-recovery-settings-callout gl-mt-5',
   alert_data: { feature_id: Users::CalloutsHelper::TWO_FACTOR_AUTH_RECOVERY_SETTINGS_CHECK, dismiss_endpoint: callouts_path, defer_links: 'true' },
   close_button_data: { testid: 'close-account-recovery-regular-check-callout' } do
   .gl-alert-body

ee/spec/features/account_recovery_regular_check_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe 'Account recovery regular check callout' do
       end
 
       it 'does not show the callout' do
-        visit root_dashboard_path
+        visit dashboard_todos_path
 
         expect(page).not_to have_content(message)
       end
@@ -32,12 +32,11 @@ RSpec.describe 'Account recovery regular check callout' do
           fill_in 'current_password', with: user_two_factor_disabled.password
 
           click_button 'Register with two-factor app'
-
-          expect(page).not_to have_content(message)
-
           click_button 'Copy codes'
           click_link 'Proceed'
 
+          visit dashboard_todos_path
+
           expect(page).not_to have_content(message)
         end
       end
@@ -49,14 +48,14 @@ RSpec.describe 'Account recovery regular check callout' do
       end
 
       it 'shows callout if not dismissed' do
-        visit root_dashboard_path
+        visit dashboard_todos_path
 
         expect(page).to have_content(message)
         expect(page).to have_link(action_button, href: profile_two_factor_auth_path)
       end
 
       it 'hides callout when user clicks action button', :js do
-        visit root_dashboard_path
+        visit dashboard_todos_path
 
         expect(page).to have_content(message)
 
@@ -67,7 +66,7 @@ RSpec.describe 'Account recovery regular check callout' do
       end
 
       it 'hides callout when user clicks close', :js do
-        visit root_dashboard_path
+        visit dashboard_todos_path
 
         expect(page).to have_content(message)
 
@@ -77,25 +76,25 @@ RSpec.describe 'Account recovery regular check callout' do
       end
 
       it 'shows callout on next session if user did not dismissed it' do
-        visit root_dashboard_path
+        visit dashboard_todos_path
 
         expect(page).to have_content(message)
 
         start_new_session(user_two_factor_enabled)
-        visit root_dashboard_path
+        visit dashboard_todos_path
 
         expect(page).to have_content(message)
       end
 
       it 'hides callout on next session if user dismissed it', :js do
-        visit root_dashboard_path
+        visit dashboard_todos_path
 
         expect(page).to have_content(message)
 
         close_callout
 
         start_new_session(user_two_factor_enabled)
-        visit root_dashboard_path
+        visit dashboard_todos_path
 
         expect(page).not_to have_content(message)
       end