Commit fffb0c5d authored by Peter Hegman's avatar Peter Hegman Committed by Stan Hu

Hide open registration callout on gitlab.com

Unneeded on gitlab.com since registration will always be open
parent 572bb643
...@@ -57,7 +57,10 @@ module UserCalloutsHelper ...@@ -57,7 +57,10 @@ module UserCalloutsHelper
end end
def show_registration_enabled_user_callout? def show_registration_enabled_user_callout?
current_user&.admin? && signup_enabled? && !user_dismissed?(REGISTRATION_ENABLED_CALLOUT) !Gitlab.com? &&
current_user&.admin? &&
signup_enabled? &&
!user_dismissed?(REGISTRATION_ENABLED_CALLOUT)
end end
private private
......
---
title: Hide open registration user callout on gitlab.com
merge_request: 47865
author:
type: changed
...@@ -167,8 +167,20 @@ RSpec.describe UserCalloutsHelper do ...@@ -167,8 +167,20 @@ RSpec.describe UserCalloutsHelper do
subject { helper.show_registration_enabled_user_callout? } subject { helper.show_registration_enabled_user_callout? }
context 'when on gitlab.com' do
before do
allow(::Gitlab).to receive(:com?).and_return(true)
allow(helper).to receive(:current_user).and_return(admin)
stub_application_setting(signup_enabled: true)
allow(helper).to receive(:user_dismissed?).with(described_class::REGISTRATION_ENABLED_CALLOUT) { false }
end
it { is_expected.to be false }
end
context 'when `current_user` is not an admin' do context 'when `current_user` is not an admin' do
before do before do
allow(::Gitlab).to receive(:com?).and_return(false)
allow(helper).to receive(:current_user).and_return(user) allow(helper).to receive(:current_user).and_return(user)
stub_application_setting(signup_enabled: true) stub_application_setting(signup_enabled: true)
allow(helper).to receive(:user_dismissed?).with(described_class::REGISTRATION_ENABLED_CALLOUT) { false } allow(helper).to receive(:user_dismissed?).with(described_class::REGISTRATION_ENABLED_CALLOUT) { false }
...@@ -179,6 +191,7 @@ RSpec.describe UserCalloutsHelper do ...@@ -179,6 +191,7 @@ RSpec.describe UserCalloutsHelper do
context 'when signup is disabled' do context 'when signup is disabled' do
before do before do
allow(::Gitlab).to receive(:com?).and_return(false)
allow(helper).to receive(:current_user).and_return(admin) allow(helper).to receive(:current_user).and_return(admin)
stub_application_setting(signup_enabled: false) stub_application_setting(signup_enabled: false)
allow(helper).to receive(:user_dismissed?).with(described_class::REGISTRATION_ENABLED_CALLOUT) { false } allow(helper).to receive(:user_dismissed?).with(described_class::REGISTRATION_ENABLED_CALLOUT) { false }
...@@ -189,6 +202,7 @@ RSpec.describe UserCalloutsHelper do ...@@ -189,6 +202,7 @@ RSpec.describe UserCalloutsHelper do
context 'when user has dismissed callout' do context 'when user has dismissed callout' do
before do before do
allow(::Gitlab).to receive(:com?).and_return(false)
allow(helper).to receive(:current_user).and_return(admin) allow(helper).to receive(:current_user).and_return(admin)
stub_application_setting(signup_enabled: true) stub_application_setting(signup_enabled: true)
allow(helper).to receive(:user_dismissed?).with(described_class::REGISTRATION_ENABLED_CALLOUT) { true } allow(helper).to receive(:user_dismissed?).with(described_class::REGISTRATION_ENABLED_CALLOUT) { true }
...@@ -197,8 +211,9 @@ RSpec.describe UserCalloutsHelper do ...@@ -197,8 +211,9 @@ RSpec.describe UserCalloutsHelper do
it { is_expected.to be false } it { is_expected.to be false }
end end
context 'when `current_user` is an admin, signup is enabled, and user has not dismissed callout' do context 'when not gitlab.com, `current_user` is an admin, signup is enabled, and user has not dismissed callout' do
before do before do
allow(::Gitlab).to receive(:com?).and_return(false)
allow(helper).to receive(:current_user).and_return(admin) allow(helper).to receive(:current_user).and_return(admin)
stub_application_setting(signup_enabled: true) stub_application_setting(signup_enabled: true)
allow(helper).to receive(:user_dismissed?).with(described_class::REGISTRATION_ENABLED_CALLOUT) { false } allow(helper).to receive(:user_dismissed?).with(described_class::REGISTRATION_ENABLED_CALLOUT) { false }
......
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