diff --git a/ee/app/helpers/trial_registrations_helper.rb b/ee/app/helpers/trial_registrations_helper.rb index 505a097dae1b7f95ce0bc9cd19404949bc0bae01..b088482fbcf3f5d926653c8eaa9a727256cb53d0 100644 --- a/ee/app/helpers/trial_registrations_helper.rb +++ b/ee/app/helpers/trial_registrations_helper.rb @@ -35,7 +35,7 @@ module TrialRegistrationsHelper ].freeze def social_signin_enabled? - ::Gitlab.com? && + ::Onboarding::Status.enabled? && omniauth_enabled? && devise_mapping.omniauthable? && button_based_providers_enabled? diff --git a/ee/spec/helpers/trial_registrations_helper_spec.rb b/ee/spec/helpers/trial_registrations_helper_spec.rb index 504d5749585f94f6a62ab000474b44475e6a32e7..1a91dd722e0d8ef5bc76fb60905216b6e4b5bf6e 100644 --- a/ee/spec/helpers/trial_registrations_helper_spec.rb +++ b/ee/spec/helpers/trial_registrations_helper_spec.rb @@ -7,7 +7,7 @@ describe '#social_signin_enabled?' do before do - allow(::Gitlab).to receive(:com?).and_return(com) + allow(::Onboarding::Status).to receive(:enabled?).and_return(onboarding_enabled) allow(view).to receive(:omniauth_enabled?).and_return(omniauth_enabled) allow(view).to receive(:button_based_providers_enabled?).and_return(button_based_providers_enabled) allow(view).to receive(:devise_mapping).and_return(instance_double(Devise::Mapping, omniauthable?: omniauthable)) @@ -15,13 +15,13 @@ subject { helper.social_signin_enabled? } - where com: [true, false], + where onboarding_enabled: [true, false], omniauth_enabled: [true, false], omniauthable: [true, false], button_based_providers_enabled: [true, false] with_them do - let(:result) { com && omniauth_enabled && button_based_providers_enabled && omniauthable } + let(:result) { onboarding_enabled && omniauth_enabled && button_based_providers_enabled && omniauthable } it { is_expected.to eq(result) } end