Commit f55f20a8 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch '215955-redirect-loop-when-logging-in-for-the-experimental-sign_up-flow' into 'master'

Resolve "Redirect loop when logging in for the experimental sign_up flow"

Closes #215955

See merge request gitlab-org/gitlab!31229
parents ee88ac73 d33c74e5
......@@ -8,7 +8,7 @@ class RegistrationsController < Devise::RegistrationsController
layout :choose_layout
skip_before_action :required_signup_info, only: [:welcome, :update_registration]
skip_before_action :required_signup_info, :check_two_factor_requirement, only: [:welcome, :update_registration]
prepend_before_action :check_captcha, only: :create
before_action :whitelist_query_limiting, only: [:destroy]
before_action :ensure_terms_accepted,
......
---
title: Fix redirect loop on .com when 2FA is required
merge_request: 31229
author:
type: fixed
......@@ -419,24 +419,34 @@ describe RegistrationsController do
describe '#welcome' do
subject { get :welcome }
before do
sign_in(create(:user))
end
context 'signup_flow experiment enabled' do
before do
stub_experiment_for_user(signup_flow: true)
end
it 'renders the devise_experimental_separate_sign_up_flow layout' do
sign_in(create(:user))
expected_layout = Gitlab.ee? ? :checkout : :devise_experimental_separate_sign_up_flow
expect(subject).to render_template(expected_layout)
end
context '2FA is required from group' do
before do
user = create(:user, require_two_factor_authentication_from_group: true)
sign_in(user)
end
it 'does not perform a redirect' do
expect(subject).not_to redirect_to(profile_two_factor_auth_path)
end
end
end
context 'signup_flow experiment disabled' do
before do
sign_in(create(:user))
stub_experiment_for_user(signup_flow: false)
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment