Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 79 insertions, 0 deletions

diff --git a/spec/controllers/registrations/welcome_controller_spec.rb b/spec/controllers/registrations/welcome_controller_spec.rb
new file mode 100644
index 00000000000..d32c936b8c9
--- /dev/null
+++ b/spec/controllers/registrations/welcome_controller_spec.rb
@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Registrations::WelcomeController do
+  let(:user) { create(:user) }
+
+  describe '#welcome' do
+    subject(:show) { get :show }
+
+    context 'without a signed in user' do
+      it { is_expected.to redirect_to new_user_registration_path }
+    end
+
+    context 'when role or setup_for_company is not set' do
+      before do
+        sign_in(user)
+      end
+
+      it { is_expected.to render_template(:show) }
+    end
+
+    context 'when role is required and setup_for_company is not set' do
+      before do
+        user.set_role_required!
+        sign_in(user)
+      end
+
+      it { is_expected.to render_template(:show) }
+    end
+
+    context 'when role and setup_for_company is set' do
+      before do
+        user.update!(setup_for_company: false)
+        sign_in(user)
+      end
+
+      it { is_expected.to redirect_to(dashboard_projects_path)}
+    end
+
+    context 'when role is set and setup_for_company is not set' do
+      before do
+        user.update!(role: :software_developer)
+        sign_in(user)
+      end
+
+      it { is_expected.to render_template(:show) }
+    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
+
+  describe '#update' do
+    subject(:update) do
+      patch :update, params: { user: { role: 'software_developer', setup_for_company: 'false' } }
+    end
+
+    context 'without a signed in user' do
+      it { is_expected.to redirect_to new_user_registration_path }
+    end
+
+    context 'with a signed in user' do
+      before do
+        sign_in(user)
+      end
+
+      it { is_expected.to redirect_to(dashboard_projects_path)}
+    end
+  end
+end