Add latest changes from gitlab-org/gitlab@master

1 files changed, 18 insertions, 8 deletions

diff --git a/spec/services/notes/destroy_service_spec.rb b/spec/services/notes/destroy_service_spec.rb
index 55acdabef82..be95a4bb181 100644
--- a/spec/services/notes/destroy_service_spec.rb
+++ b/spec/services/notes/destroy_service_spec.rb
@@ -25,15 +25,25 @@ RSpec.describe Notes::DestroyService do
         .to change { user.todos_pending_count }.from(1).to(0)
     end
 
-    it 'tracks issue comment removal usage data', :clean_gitlab_redis_shared_state do
-      note = create(:note, project: project, noteable: issue)
-      event = Gitlab::UsageDataCounters::IssueActivityUniqueCounter::ISSUE_COMMENT_REMOVED
-      counter = Gitlab::UsageDataCounters::HLLRedisCounter
+    describe 'comment removed event tracking', :snowplow do
+      let(:property) { Gitlab::UsageDataCounters::IssueActivityUniqueCounter::ISSUE_COMMENT_REMOVED }
+      let(:note) { create(:note, project: project, noteable: issue) }
+      let(:service_action) { described_class.new(project, user).execute(note) }
+
+      it 'tracks issue comment removal usage data', :clean_gitlab_redis_shared_state do
+        counter = Gitlab::UsageDataCounters::HLLRedisCounter
+
+        expect(Gitlab::UsageDataCounters::IssueActivityUniqueCounter).to receive(:track_issue_comment_removed_action)
+                                                                           .with(author: user, project: project)
+                                                                           .and_call_original
+        expect do
+          service_action
+        end.to change { counter.unique_events(event_names: property, start_date: 1.day.ago, end_date: 1.day.from_now) }.by(1)
+      end
 
-      expect(Gitlab::UsageDataCounters::IssueActivityUniqueCounter).to receive(:track_issue_comment_removed_action).with(author: user).and_call_original
-      expect do
-        described_class.new(project, user).execute(note)
-      end.to change { counter.unique_events(event_names: event, start_date: 1.day.ago, end_date: 1.day.from_now) }.by(1)
+      it_behaves_like 'issue_edit snowplow tracking' do
+        subject(:execute_service_action) { service_action }
+      end
     end
 
     it 'tracks merge request usage data' do