1 files changed, 17 insertions, 25 deletions
diff --git a/spec/rubocop/cop/usage_data/distinct_count_by_large_foreign_key_spec.rb b/spec/rubocop/cop/usage_data/distinct_count_by_large_foreign_key_spec.rb
index 1c90df798a5..b6711effe9e 100644
--- a/spec/rubocop/cop/usage_data/distinct_count_by_large_foreign_key_spec.rb
+++ b/spec/rubocop/cop/usage_data/distinct_count_by_large_foreign_key_spec.rb
@@ -1,17 +1,13 @@
 # frozen_string_literal: true
 
 require 'fast_spec_helper'
-
 require 'rubocop'
-require 'rubocop/rspec/support'
 
 require_relative '../../../../rubocop/cop/usage_data/distinct_count_by_large_foreign_key'
 
 RSpec.describe RuboCop::Cop::UsageData::DistinctCountByLargeForeignKey do
-  include CopHelper
-
   let(:allowed_foreign_keys) { [:author_id, :user_id, :'merge_requests.target_project_id'] }
-
+  let(:msg) { 'Avoid doing `distinct_count` on foreign keys for large tables having above 100 million rows.' }
   let(:config) do
     RuboCop::Config.new('UsageData/DistinctCountByLargeForeignKey' => {
                           'AllowedForeignKeys' => allowed_foreign_keys
@@ -21,36 +17,32 @@ RSpec.describe RuboCop::Cop::UsageData::DistinctCountByLargeForeignKey do
   subject(:cop) { described_class.new(config) }
 
   context 'when counting by disallowed key' do
-    it 'registers an offence' do
-      inspect_source('distinct_count(Issue, :creator_id)')
-
-      expect(cop.offenses.size).to eq(1)
+    it 'registers an offense' do
+      expect_offense(<<~CODE)
+        distinct_count(Issue, :creator_id)
+        ^^^^^^^^^^^^^^ #{msg}
+      CODE
     end
 
-    it 'does not register an offence when batch is false' do
-      inspect_source('distinct_count(Issue, :creator_id, batch: false)')
-
-      expect(cop.offenses).to be_empty
+    it 'does not register an offense when batch is false' do
+      expect_no_offenses('distinct_count(Issue, :creator_id, batch: false)')
     end
 
-    it 'register an offence when batch is true' do
-      inspect_source('distinct_count(Issue, :creator_id, batch: true)')
-
-      expect(cop.offenses.size).to eq(1)
+    it 'registers an offense when batch is true' do
+      expect_offense(<<~CODE)
+        distinct_count(Issue, :creator_id, batch: true)
+        ^^^^^^^^^^^^^^ #{msg}
+      CODE
     end
   end
 
   context 'when calling by allowed key' do
-    it 'does not register an offence with symbol' do
-      inspect_source('distinct_count(Issue, :author_id)')
-
-      expect(cop.offenses).to be_empty
+    it 'does not register an offense with symbol' do
+      expect_no_offenses('distinct_count(Issue, :author_id)')
     end
 
-    it 'does not register an offence with string' do
-      inspect_source("distinct_count(Issue, 'merge_requests.target_project_id')")
-
-      expect(cop.offenses).to be_empty
+    it 'does not register an offense with string' do
+      expect_no_offenses("distinct_count(Issue, 'merge_requests.target_project_id')")
     end
   end
 end