Merge branch...

Merge branch '220110-fully-hook-up-functionality-of-new-experience-level-sign-up-step' into 'master'

Fully hook up functionality of new Experience Level sign-up step

See merge request gitlab-org/gitlab!33668

app/controllers/registrations/experience_levels_controller.rb

+# frozen_string_literal: true
+
+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'
+
+    before_action :check_experiment_enabled
+    before_action :ensure_namespace_path_param
+
+    def update
+      current_user.experience_level = params[:experience_level]
+
+      if current_user.save
+        flash[:message] = I18n.t('devise.registrations.signed_up')
+        redirect_to group_path(params[:namespace_path])
+      else
+        render :show
+      end
+    end
+
+    private
+
+    def check_experiment_enabled
+      access_denied! unless experiment_enabled?(:onboarding_issues)
+    end
+
+    def ensure_namespace_path_param
+      redirect_to root_path unless params[:namespace_path].present?
+    end
+  end
+end

app/controllers/registrations_controller.rb

@@ -14,7 +14,6 @@ class RegistrationsController < Devise::RegistrationsController
   before_action :ensure_terms_accepted,
     if: -> { action_name == 'create' && Gitlab::CurrentSettings.current_application_settings.enforce_terms? }
   before_action :load_recaptcha, only: :new
-  before_action :authenticate_user!, only: :experience_level
 
   def new
     if experiment_enabled?(:signup_flow)
@@ -58,10 +57,6 @@ class RegistrationsController < Devise::RegistrationsController
     return redirect_to path_for_signed_in_user(current_user) if current_user.role.present? && !current_user.setup_for_company.nil?
   end
 
-  def experience_level
-    return access_denied! unless experiment_enabled?(:onboarding_issues)
-  end
-
   def update_registration
     user_params = params.require(:user).permit(:role, :setup_for_company)
     result = ::Users::SignupService.new(current_user, user_params).execute

app/models/user.rb

@@ -276,6 +276,7 @@ class User < ApplicationRecord
             :sourcegraph_enabled, :sourcegraph_enabled=,
             :setup_for_company, :setup_for_company=,
             :render_whitespace_in_code, :render_whitespace_in_code=,
+            :experience_level, :experience_level=,
             to: :user_preference
 
   delegate :path, to: :namespace, allow_nil: true, prefix: true

app/views/registrations/experience_level.html.haml → app/views/registrations/experience_levels/show.html.haml

-- content_for(:page_title, _('What’s your experience level?'))
+- page_title _('What’s your experience level?')
 
 %h3= _('Hello there')
 %p= _('Welcome to the guided GitLab tour')
@@ -14,7 +14,7 @@
     %b= _('Novice')
   %p= _('I’m not very familiar with the basics of project management and DevOps.')
   %p
-    %a{ href: '#novice' }= _('Show me everything')
+    = link_to _('Show me everything'), users_sign_up_experience_level_path(experience_level: :novice, namespace_path: params[:namespace_path]), method: :patch
 
 %hr
 
@@ -23,4 +23,4 @@
     %b= _('Experienced')
   %p= _('I’m familiar with the basics of project management and DevOps.')
   %p
-    %a{ href: '#experienced' }= _('Show me more advanced stuff')
+    = link_to _('Show me more advanced stuff'), users_sign_up_experience_level_path(experience_level: :experienced, namespace_path: params[:namespace_path]), method: :patch

config/routes.rb

@@ -48,7 +48,7 @@ Rails.application.routes.draw do
   scope path: '/users/sign_up', module: :registrations, as: :users_sign_up do
     get :welcome
     patch :update_registration
-    get :experience_level
+    resource :experience_level, only: [:show, :update]
 
     Gitlab.ee do
       resources :groups, only: [:new, :create]

ee/app/controllers/registrations/projects_controller.rb

@@ -16,7 +16,7 @@ module Registrations
 
       if @project.saved?
         create_learn_gitlab_project
-        redirect_to users_sign_up_experience_level_path
+        redirect_to users_sign_up_experience_level_path(namespace_path: @project.namespace)
       else
         render :new
       end

ee/spec/controllers/registrations/projects_controller_spec.rb

@@ -70,7 +70,7 @@ RSpec.describe Registrations::ProjectsController do
         Sidekiq::Worker.drain_all
 
         expect(subject).to have_gitlab_http_status(:redirect)
-        expect(subject).to redirect_to(users_sign_up_experience_level_path)
+        expect(subject).to redirect_to(users_sign_up_experience_level_path(namespace_path: namespace.to_param))
         expect(namespace.projects.find_by_name(s_('Learn GitLab'))).to be_import_finished
         expect(cookies[:onboarding_issues_settings]).not_to be_nil
       end

spec/controllers/registrations/experience_levels_controller_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Registrations::ExperienceLevelsController do
+  let_it_be(:namespace) { create(:group, path: 'group-path' ) }
+  let_it_be(:user) { create(:user) }
+
+  let(:params) { { namespace_path: namespace.to_param } }
+
+  describe 'GET #show' do
+    subject { get :show, params: params }
+
+    context 'with an unauthenticated user' do
+      it { is_expected.to have_gitlab_http_status(:redirect) }
+      it { is_expected.to redirect_to(new_user_session_path) }
+    end
+
+    context 'with an authenticated user' do
+      before do
+        sign_in(user)
+        stub_experiment_for_user(onboarding_issues: true)
+      end
+
+      it { is_expected.to have_gitlab_http_status(:ok) }
+      it { is_expected.to render_template(:show) }
+
+      context 'when not part of the onboarding issues experiment' do
+        before do
+          stub_experiment_for_user(onboarding_issues: false)
+        end
+
+        it { is_expected.to have_gitlab_http_status(:not_found) }
+      end
+    end
+  end
+
+  describe 'PUT/PATCH #update' do
+    subject { patch :update, params: params }
+
+    context 'with an unauthenticated user' do
+      it { is_expected.to have_gitlab_http_status(:redirect) }
+      it { is_expected.to redirect_to(new_user_session_path) }
+    end
+
+    context 'with an authenticated user' do
+      before do
+        sign_in(user)
+        stub_experiment_for_user(onboarding_issues: true)
+      end
+
+      context 'when not part of the onboarding issues experiment' do
+        before do
+          stub_experiment_for_user(onboarding_issues: false)
+        end
+
+        it { is_expected.to have_gitlab_http_status(:not_found) }
+      end
+
+      context 'when user is successfully updated' do
+        it { is_expected.to set_flash[:message].to('Welcome! You have signed up successfully.') }
+
+        context 'when no experience_level is sent' do
+          before do
+            user.user_preference.update_attribute(:experience_level, :novice)
+          end
+
+          it 'will unset the user’s experience level' do
+            expect { subject }.to change { user.reload.experience_level }.to(nil)
+          end
+        end
+
+        context 'when an expected experience level is sent' do
+          let(:params) { super().merge(experience_level: :novice) }
+
+          it 'sets the user’s experience level' do
+            expect { subject }.to change { user.reload.experience_level }.from(nil).to('novice')
+          end
+        end
+
+        context 'when an unexpected experience level is sent' do
+          let(:params) { super().merge(experience_level: :nonexistent) }
+
+          it 'raises an exception' do
+            expect { subject }.to raise_error(ArgumentError, "'nonexistent' is not a valid experience_level")
+          end
+        end
+
+        context 'when a namespace_path is sent' do
+          it { is_expected.to have_gitlab_http_status(:redirect) }
+          it { is_expected.to redirect_to(group_path(namespace)) }
+        end
+
+        context 'when no namespace_path is sent' do
+          let(:params) { super().merge(namespace_path: nil) }
+
+          it { is_expected.to have_gitlab_http_status(:redirect) }
+          it { is_expected.to redirect_to(root_path) }
+        end
+      end
+
+      context 'when user update fails' do
+        before do
+          allow_any_instance_of(User).to receive(:save).and_return(false)
+        end
+
+        it { is_expected.to render_template(:show) }
+      end
+    end
+  end
+end

spec/controllers/registrations_controller_spec.rb

@@ -445,27 +445,4 @@ RSpec.describe RegistrationsController do
       end
     end
   end
-
-  describe '#experience_level' do
-    subject { get :experience_level }
-
-    let_it_be(:user) { create(:user) }
-
-    let(:part_of_onboarding_issues_experiment) { false }
-
-    before do
-      stub_experiment_for_user(onboarding_issues: part_of_onboarding_issues_experiment)
-      sign_in(user)
-    end
-
-    context 'when not part of the onboarding issues experiment' do
-      it { is_expected.to have_gitlab_http_status(:not_found) }
-    end
-
-    context 'when part of the onboarding issues experiment' do
-      let(:part_of_onboarding_issues_experiment) { true }
-
-      it { is_expected.to render_template(:experience_level) }
-    end
-  end
 end

spec/models/user_spec.rb

@@ -53,6 +53,9 @@ describe User do
     it { is_expected.to delegate_method(:render_whitespace_in_code).to(:user_preference) }
     it { is_expected.to delegate_method(:render_whitespace_in_code=).to(:user_preference).with_arguments(:args) }
 
+    it { is_expected.to delegate_method(:experience_level).to(:user_preference) }
+    it { is_expected.to delegate_method(:experience_level=).to(:user_preference).with_arguments(:args) }
+
     it { is_expected.to delegate_method(:job_title).to(:user_detail).allow_nil }
     it { is_expected.to delegate_method(:job_title=).to(:user_detail).with_arguments(:args).allow_nil }
   end