Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 1 insertions, 7 deletions

diff --git a/spec/helpers/application_settings_helper_spec.rb b/spec/helpers/application_settings_helper_spec.rb
index eafdbfa8d0a..914c866c464 100644
--- a/spec/helpers/application_settings_helper_spec.rb
+++ b/spec/helpers/application_settings_helper_spec.rb
@@ -273,15 +273,9 @@ RSpec.describe ApplicationSettingsHelper do
     end
   end
 
-  describe '.registration_features_can_be_prompted?' do
+  describe '.registration_features_can_be_prompted?', :without_license do
     subject { helper.registration_features_can_be_prompted? }
 
-    before do
-      if Gitlab.ee?
-        allow(License).to receive(:current).and_return(nil)
-      end
-    end
-
     context 'when service ping is enabled' do
       before do
         stub_application_setting(usage_ping_enabled: true)