Add latest changes from gitlab-org/gitlab@master

1 files changed, 32 insertions, 0 deletions

diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb
index 792219d830d..d7fe3e87056 100644
--- a/spec/controllers/registrations_controller_spec.rb
+++ b/spec/controllers/registrations_controller_spec.rb
@@ -415,4 +415,36 @@ describe RegistrationsController do
       patch :update_registration, params: { user: { role: 'software_developer', setup_for_company: 'false' } }
     end
   end
+
+  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
+        expected_layout = Gitlab.ee? ? :checkout : :devise_experimental_separate_sign_up_flow
+
+        expect(subject).to render_template(expected_layout)
+      end
+    end
+
+    context 'signup_flow experiment disabled' do
+      before do
+        stub_experiment_for_user(signup_flow: false)
+      end
+
+      it 'renders the devise layout' do
+        expected_layout = Gitlab.ee? ? :checkout : :devise
+
+        expect(subject).to render_template(expected_layout)
+      end
+    end
+  end
 end