Count comments on notes and merge requests

This extends our existing `Gitlab::UsageDataCounters::NoteCounter` to
also count notes on commits and merge requests

1 files changed, 17 insertions, 7 deletions

diff --git a/spec/lib/gitlab/usage_data_counters/note_counter_spec.rb b/spec/lib/gitlab/usage_data_counters/note_counter_spec.rb
index 1669a22879f..b385d1b07c7 100644
--- a/spec/lib/gitlab/usage_data_counters/note_counter_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/note_counter_spec.rb
@@ -26,16 +26,22 @@ describe Gitlab::UsageDataCounters::NoteCounter, :clean_gitlab_redis_shared_stat
   end
 
   it_behaves_like 'a note usage counter', :create, 'Snippet'
+  it_behaves_like 'a note usage counter', :create, 'MergeRequest'
+  it_behaves_like 'a note usage counter', :create, 'Commit'
 
   describe '.totals' do
     let(:combinations) do
       [
-        [:create, 'Snippet', 3]
+        [:create, 'Snippet', 3],
+        [:create, 'MergeRequest', 4],
+        [:create, 'Commit', 5]
       ]
     end
 
     let(:expected_totals) do
-      { snippet_comment: 3 }
+      { snippet_comment: 3,
+        merge_request_comment: 4,
+        commit_comment:  5 }
     end
 
     before do
@@ -57,14 +63,18 @@ describe Gitlab::UsageDataCounters::NoteCounter, :clean_gitlab_redis_shared_stat
     let(:unknown_event_error) { Gitlab::UsageDataCounters::BaseCounter::UnknownEvent }
 
     where(:event, :noteable_type, :expected_count, :should_raise) do
-      :create | 'Snippet' | 1 | false
-      :wibble | 'Snippet' | 0 | true
-      :create | 'Issue'   | 0 | false
-      :wibble | 'Issue'   | 0 | false
+      :create | 'Snippet'      | 1 | false
+      :wibble | 'Snippet'      | 0 | true
+      :create | 'MergeRequest' | 1 | false
+      :wibble | 'MergeRequest' | 0 | true
+      :create | 'Commit'       | 1 | false
+      :wibble | 'Commit'       | 0 | true
+      :create | 'Issue'        | 0 | false
+      :wibble | 'Issue'        | 0 | false
     end
 
     with_them do
-      it "handles event" do
+      it 'handles event' do
         if should_raise
           expect { described_class.count(event, noteable_type) }.to raise_error(unknown_event_error)
         else