Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 20 insertions, 5 deletions

diff --git a/spec/services/users/signup_service_spec.rb b/spec/services/users/signup_service_spec.rb
index cc234309817..7169401ab34 100644
--- a/spec/services/users/signup_service_spec.rb
+++ b/spec/services/users/signup_service_spec.rb
@@ -48,12 +48,27 @@ RSpec.describe Users::SignupService do
         expect(user.reload.setup_for_company).to be(false)
       end
 
-      it 'returns an error result when setup_for_company is missing' do
-        result = update_user(user, setup_for_company: '')
+      context 'when on .com' do
+        before do
+          allow(Gitlab).to receive(:com?).and_return(true)
+        end
 
-        expect(user.reload.setup_for_company).not_to be_blank
-        expect(result[:status]).to eq(:error)
-        expect(result[:message]).to eq("Setup for company can't be blank")
+        it 'returns an error result when setup_for_company is missing' do
+          result = update_user(user, setup_for_company: '')
+
+          expect(user.reload.setup_for_company).not_to be_blank
+          expect(result[:status]).to eq(:error)
+          expect(result[:message]).to eq("Setup for company can't be blank")
+        end
+      end
+
+      context 'when not on .com' do
+        it 'returns success when setup_for_company is blank' do
+          result = update_user(user, setup_for_company: '')
+
+          expect(result).to eq(status: :success)
+          expect(user.reload.setup_for_company).to be(nil)
+        end
       end
     end