Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 25 deletions

diff --git a/spec/services/service_ping/permit_data_categories_service_spec.rb b/spec/services/service_ping/permit_data_categories_service_spec.rb
index 4fd5c6f9ccb..5b25f216c4d 100644
--- a/spec/services/service_ping/permit_data_categories_service_spec.rb
+++ b/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 }
 
@@ -41,27 +39,4 @@ RSpec.describe ServicePing::PermitDataCategoriesService do
       end
     end
   end
-
-  describe '#product_intelligence_enabled?' do
-    where(:usage_ping_enabled, :requires_usage_stats_consent, :expected_product_intelligence_enabled) do
-      # Usage ping enabled
-      true  | false | true
-      true  | true  | false
-
-      # Usage ping disabled
-      false | false | false
-      false | true  | false
-    end
-
-    with_them do
-      before do
-        allow(User).to receive(:single_user).and_return(double(:user, requires_usage_stats_consent?: requires_usage_stats_consent))
-        stub_config_setting(usage_ping_enabled: usage_ping_enabled)
-      end
-
-      it 'has the correct product_intelligence_enabled?' do
-        expect(described_class.new.product_intelligence_enabled?).to eq(expected_product_intelligence_enabled)
-      end
-    end
-  end
 end