Prepend EE to CE

app/services/service_ping/service_ping_settings.rb

@@ -2,16 +2,18 @@
 
 module ServicePing
   module ServicePingSettings
-    class << self
-      def product_intelligence_enabled?
-        pings_enabled? && !User.single_user&.requires_usage_stats_consent?
-      end
+    extend self
 
-      private
+    def product_intelligence_enabled?
+      pings_enabled? && !User.single_user&.requires_usage_stats_consent?
+    end
+
+    private
 
-      def pings_enabled?
-        ::Gitlab::CurrentSettings.usage_ping_enabled?
-      end
+    def pings_enabled?
+      ::Gitlab::CurrentSettings.usage_ping_enabled?
     end
   end
 end
+
+ServicePing::ServicePingSettings.extend_mod_with('ServicePing::ServicePingSettings')

ee/app/services/ee/service_ping/permit_data_categories_service.rb

@@ -13,7 +13,7 @@ module EE
       override :execute
       def execute
         return super unless ::License.current.present?
-        return [] unless ServicePing::ServicePingSettings.product_intelligence_enabled?
+        return [] unless ServicePingSettings.product_intelligence_enabled?
 
         optional_enabled = ::Gitlab::CurrentSettings.usage_ping_enabled?
         customer_service_enabled = ::License.current.customer_service_enabled?

ee/app/services/ee/service_ping/service_ping_settings.rb

@@ -3,16 +3,13 @@
 module EE
   module ServicePing
     module ServicePingSettings
-      class << self
-        def product_intelligence_enabled?
-          pings_enabled? && !::User.single_user&.requires_usage_stats_consent?
-        end
+      extend ::Gitlab::Utils::Override
 
-        private
+      private
 
-        def pings_enabled?
-          ::License.current&.customer_service_enabled? || ::Gitlab::CurrentSettings.usage_ping_enabled?
-        end
+      override :pings_enabled?
+      def pings_enabled?
+        ::License.current&.customer_service_enabled? || super
       end
     end
   end

ee/spec/services/ee/service_ping/permit_data_categories_service_spec.rb

@@ -3,8 +3,6 @@
 require 'spec_helper'
 
 RSpec.describe ServicePing::PermitDataCategoriesService do
-  using RSpec::Parameterized::TableSyntax
-
   describe '#execute' do
     subject(:permitted_categories) { described_class.new.execute }
 

ee/spec/services/ee/service_ping/service_ping_settings_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe EE::ServicePing::ServicePingSettings do
+RSpec.describe ServicePing::ServicePingSettings do
   using RSpec::Parameterized::TableSyntax
 
   describe '#product_intelligence_enabled?' do

spec/services/service_ping/permit_data_categories_service_spec.rb

@@ -3,8 +3,6 @@
 require 'spec_helper'
 
 RSpec.describe ServicePing::PermitDataCategoriesService do
-  using RSpec::Parameterized::TableSyntax
-
   describe '#execute', :without_license do
     subject(:permitted_categories) { described_class.new.execute }