Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42

4 files changed, 43 insertions, 8 deletions

diff --git a/spec/lib/gitlab/usage_data_counters/ci_template_unique_counter_spec.rb b/spec/lib/gitlab/usage_data_counters/ci_template_unique_counter_spec.rb
index d4148b57348..4996b0a0089 100644
--- a/spec/lib/gitlab/usage_data_counters/ci_template_unique_counter_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/ci_template_unique_counter_spec.rb
@@ -77,11 +77,22 @@ RSpec.describe Gitlab::UsageDataCounters::CiTemplateUniqueCounter do
       let(:project_id) { 1 }
       let(:config_source) { :repository_source }
 
-      Dir.glob(File.join('lib', 'gitlab', 'ci', 'templates', '**'), base: Rails.root) do |template|
+      described_class.ci_templates.each do |template|
         next if described_class::TEMPLATE_TO_EVENT.key?(template)
 
-        it "does not track #{template}" do
-          expect(Gitlab::UsageDataCounters::HLLRedisCounter).not_to(receive(:track_event))
+        it "has an event defined for #{template}" do
+          expect do
+            described_class.track_unique_project_event(
+              project_id: project_id,
+              template: template,
+              config_source: config_source
+            )
+          end.not_to raise_error
+        end
+
+        it "tracks #{template}" do
+          expected_template_event_name = described_class.ci_template_event_name(template, :repository_source)
+          expect(Gitlab::UsageDataCounters::HLLRedisCounter).to(receive(:track_event)).with(expected_template_event_name, values: project_id)
 
           described_class.track_unique_project_event(project_id: project_id, template: template, config_source: config_source)
         end
diff --git a/spec/lib/gitlab/usage_data_counters/code_review_events_spec.rb b/spec/lib/gitlab/usage_data_counters/code_review_events_spec.rb
index a1dee442131..c4a84445a01 100644
--- a/spec/lib/gitlab/usage_data_counters/code_review_events_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/code_review_events_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe 'Code review events' do
 
     code_review_events = Gitlab::UsageDataCounters::HLLRedisCounter.events_for_category("code_review")
 
-    exceptions = %w[i_code_review_mr_diffs i_code_review_mr_single_file_diffs]
+    exceptions = %w[i_code_review_mr_diffs i_code_review_mr_single_file_diffs i_code_review_total_suggestions_applied i_code_review_total_suggestions_added]
     code_review_aggregated_events += exceptions
 
     expect(code_review_events - code_review_aggregated_events).to be_empty
diff --git a/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb b/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb
index 887759014f5..427dd4a205e 100644
--- a/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb
@@ -462,6 +462,8 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
       allow(described_class).to receive(:known_events).and_return(known_events)
       allow(described_class).to receive(:categories).and_return(%w(category1 category2))
 
+      stub_const('Gitlab::UsageDataCounters::HLLRedisCounter::CATEGORIES_FOR_TOTALS', %w(category1 category2))
+
       described_class.track_event('event1_slot', values: entity1, time: 2.days.ago)
       described_class.track_event('event2_slot', values: entity2, time: 2.days.ago)
       described_class.track_event('event2_slot', values: entity3, time: 2.weeks.ago)
diff --git a/spec/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter_spec.rb b/spec/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter_spec.rb
index 041fc2f20a8..cd3388701fe 100644
--- a/spec/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter_spec.rb
@@ -206,18 +206,32 @@ RSpec.describe Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter, :cl
   end
 
   describe '.track_add_suggestion_action' do
-    subject { described_class.track_add_suggestion_action(user: user) }
+    subject { described_class.track_add_suggestion_action(note: note) }
+
+    before do
+      note.suggestions << build(:suggestion, id: 1, note: note)
+    end
 
     it_behaves_like 'a tracked merge request unique event' do
-      let(:action) { described_class::MR_ADD_SUGGESTION_ACTION }
+      let(:action) { described_class::MR_USER_ADD_SUGGESTION_ACTION }
+    end
+
+    it_behaves_like 'a tracked merge request unique event' do
+      let(:action) { described_class::MR_TOTAL_ADD_SUGGESTION_ACTION }
     end
   end
 
   describe '.track_apply_suggestion_action' do
-    subject { described_class.track_apply_suggestion_action(user: user) }
+    subject { described_class.track_apply_suggestion_action(user: user, suggestions: suggestions) }
+
+    let(:suggestions) { [build(:suggestion, id: 1, note: note)] }
+
+    it_behaves_like 'a tracked merge request unique event' do
+      let(:action) { described_class::MR_USER_APPLY_SUGGESTION_ACTION }
+    end
 
     it_behaves_like 'a tracked merge request unique event' do
-      let(:action) { described_class::MR_APPLY_SUGGESTION_ACTION }
+      let(:action) { described_class::MR_TOTAL_APPLY_SUGGESTION_ACTION }
     end
   end
 
@@ -394,4 +408,12 @@ RSpec.describe Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter, :cl
       let(:action) { described_class::MR_RESOLVE_CONFLICT_ACTION }
     end
   end
+
+  describe '.track_resolve_thread_in_issue_action' do
+    subject { described_class.track_resolve_thread_in_issue_action(user: user) }
+
+    it_behaves_like 'a tracked merge request unique event' do
+      let(:action) { described_class::MR_RESOLVE_THREAD_IN_ISSUE_ACTION }
+    end
+  end
 end