Merge branch...

Merge branch '227276-new-user-onboarding-remove-banner-and-footer-links-from-onboarding-step' into 'master'

Remove banner & footer links from onboarding step

See merge request gitlab-org/gitlab!39395

app/controllers/registrations/experience_levels_controller.rb

@@ -2,9 +2,7 @@
 
 module Registrations
   class ExperienceLevelsController < ApplicationController
-    # This will need to be changed to simply 'devise' as part of
-    # https://gitlab.com/gitlab-org/growth/engineering/issues/64
-    layout 'devise_experimental_separate_sign_up_flow'
+    layout 'devise_experimental_onboarding_issues'
 
     before_action :check_experiment_enabled
     before_action :ensure_namespace_path_param

app/views/layouts/devise_experimental_onboarding_issues.html.haml

+!!! 5
+%html.devise-layout-html.navless{ class: system_message_class }
+  = render "layouts/head"
+  %body.ui-indigo.signup-page{ class: "#{client_class_list}", data: { page: body_data_page, qa_selector: 'signup_page' } }
+    = render "layouts/header/logo_with_title"
+    = render "layouts/init_client_detection_flags"
+    .page-wrap
+      .container.signup-box-container.navless-container
+        = render "layouts/broadcast"
+        .content
+          = yield

spec/controllers/registrations/experience_levels_controller_spec.rb

@@ -23,6 +23,7 @@ RSpec.describe Registrations::ExperienceLevelsController do
       end
 
       it { is_expected.to have_gitlab_http_status(:ok) }
+      it { is_expected.to render_template('layouts/devise_experimental_onboarding_issues') }
       it { is_expected.to render_template(:show) }
 
       context 'when not part of the onboarding issues experiment' do

spec/features/registrations/experience_level_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe 'Experience level screen' do
-  let_it_be(:user) { create(:user) }
+  let_it_be(:user) { create(:user, :unconfirmed) }
   let_it_be(:group) { create(:group) }
 
   before do
@@ -32,4 +32,14 @@ RSpec.describe 'Experience level screen' do
     is_expected.to have_content('I’m familiar with the basics of project management and DevOps')
     is_expected.to have_content('Show me more advanced stuff')
   end
+
+  it 'does not display any flash messages' do
+    is_expected.not_to have_selector('.flash-container')
+    is_expected.not_to have_content("Please check your email (#{user.email}) to verify that you own this address and unlock the power of CI/CD")
+  end
+
+  it 'does not include the footer links' do
+    is_expected.not_to have_link('Help')
+    is_expected.not_to have_link('About GitLab')
+  end
 end