Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 21 insertions, 3 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 db931c50bdf..8b6a2eac349 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
@@ -10,7 +10,7 @@ require_relative '../../../../rubocop/cop/usage_data/distinct_count_by_large_for
 RSpec.describe RuboCop::Cop::UsageData::DistinctCountByLargeForeignKey, type: :rubocop do
   include CopHelper
 
-  let(:allowed_foreign_keys) { %i[author_id user_id] }
+  let(:allowed_foreign_keys) { [:author_id, :user_id, :'merge_requests.target_project_id'] }
 
   let(:config) do
     RuboCop::Config.new('UsageData/DistinctCountByLargeForeignKey' => {
@@ -21,18 +21,36 @@ RSpec.describe RuboCop::Cop::UsageData::DistinctCountByLargeForeignKey, type: :r
   subject(:cop) { described_class.new(config) }
 
   context 'when counting by disallowed key' do
-    it 'register an offence' do
+    it 'registers an offence' do
       inspect_source('distinct_count(Issue, :creator_id)')
 
       expect(cop.offenses.size).to eq(1)
     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
+    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)
+    end
   end
 
   context 'when calling by allowed key' do
-    it 'does not register an offence' do
+    it 'does not register an offence with symbol' do
       inspect_source('distinct_count(Issue, :author_id)')
 
       expect(cop.offenses).to be_empty
     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
+    end
   end
 end