Reduce differences in spec/support/helpers/stub_configuration.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

ee/spec/support/helpers/ee/stub_configuration.rb

+# frozen_string_literal: true
+
 module EE
   module StubConfiguration
     def stub_ee_application_setting(messages)
@@ -12,5 +14,15 @@ module EE
       # Ensure that we don't use the Markdown cache when stubbing these values
       allow_any_instance_of(EE::ApplicationSetting).to receive(:cached_html_up_to_date?).and_return(false)
     end
+
+    def stub_application_setting_on_object(object, messages)
+      add_predicates(messages)
+
+      allow(::Gitlab::CurrentSettings.current_application_settings)
+        .to receive_messages(messages)
+      messages.each do |setting, value|
+        allow(object).to receive_message_chain(:current_application_settings, setting) { value }
+      end
+    end
   end
 end

spec/support/helpers/stub_configuration.rb

@@ -4,11 +4,7 @@ require 'active_support/dependencies'
 
 require_dependency 'gitlab'
 
-require_dependency Gitlab.root.join('ee/spec/support/helpers/ee/stub_configuration')
-
 module StubConfiguration
-  prepend EE::StubConfiguration
-
   def stub_application_setting(messages)
     add_predicates(messages)
 
@@ -22,16 +18,6 @@ module StubConfiguration
     allow_any_instance_of(ApplicationSetting).to receive(:cached_html_up_to_date?).and_return(false)
   end
 
-  def stub_application_setting_on_object(object, messages)
-    add_predicates(messages)
-
-    allow(Gitlab::CurrentSettings.current_application_settings)
-      .to receive_messages(messages)
-    messages.each do |setting, value|
-      allow(object).to receive_message_chain(:current_application_settings, setting) { value }
-    end
-  end
-
   def stub_not_protect_default_branch
     stub_application_setting(
       default_branch_protection: Gitlab::Access::PROTECTION_NONE)
@@ -130,3 +116,5 @@ module StubConfiguration
     end
   end
 end
+
+StubConfiguration.prepend(EE::StubConfiguration)