Added comment notification events to HipChat and Slack services.

Supports four different event types all bundled under the "note" event type:

- comments on a commit
- comments on an issue
- comments on a merge request
- comments on a code snippet

3 files changed, 275 insertions, 7 deletions

diff --git a/spec/models/project_services/hipchat_service_spec.rb b/spec/models/project_services/hipchat_service_spec.rb
index 804c3d5ddd9..95ce4f8e4aa 100644
--- a/spec/models/project_services/hipchat_service_spec.rb
+++ b/spec/models/project_services/hipchat_service_spec.rb
@@ -98,5 +98,91 @@ describe HipchatService do
             "<pre>please fix</pre>")
       end
     end
+
+    context "Note events" do
+      let(:user) { create(:user) }
+      let(:project) { create(:project, creator_id: user.id) }
+      let(:issue)         { create(:issue, project: project) }
+      let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
+      let(:snippet)       { create(:project_snippet, project: project) }
+      let(:commit_note) { create(:note_on_commit, author: user, project: project, commit_id: project.repository.commit.id, note: 'a comment on a commit') }
+      let(:merge_request_note) { create(:note_on_merge_request, noteable_id: merge_request.id, note: "merge request note") }
+      let(:issue_note) { create(:note_on_issue, noteable_id: issue.id, note: "issue note")}
+      let(:snippet_note) { create(:note_on_project_snippet, noteable_id: snippet.id, note: "snippet note") }
+
+      it "should call Hipchat API for commit comment events" do
+        data = Gitlab::NoteDataBuilder.build(commit_note, user)
+        hipchat.execute(data)
+
+        expect(WebMock).to have_requested(:post, api_url).once
+
+        message = hipchat.send(:create_message, data)
+
+        obj_attr = data[:object_attributes]
+        commit_id = Commit.truncate_sha(data[:commit][:id])
+        title = hipchat.send(:format_title, data[:commit][:message])
+
+        expect(message).to eq("#{user.username} commented on " \
+            "<a href=\"#{obj_attr[:url]}\">commit #{commit_id}</a> in " \
+            "<a href=\"#{project.web_url}\">#{project_name}</a>: " \
+            "#{title}" \
+            "<pre>a comment on a commit</pre>")
+      end
+
+      it "should call Hipchat API for merge request comment events" do
+        data = Gitlab::NoteDataBuilder.build(merge_request_note, user)
+        hipchat.execute(data)
+
+        expect(WebMock).to have_requested(:post, api_url).once
+
+        message = hipchat.send(:create_message, data)
+
+        obj_attr = data[:object_attributes]
+        merge_id = data[:merge_request]['iid']
+        title = data[:merge_request]['title']
+
+        expect(message).to eq("#{user.username} commented on " \
+            "<a href=\"#{obj_attr[:url]}\">merge request ##{merge_id}</a> in " \
+            "<a href=\"#{project.web_url}\">#{project_name}</a>: " \
+            "<b>#{title}</b>" \
+            "<pre>merge request note</pre>")
+      end
+
+      it "should call Hipchat API for issue comment events" do
+        data = Gitlab::NoteDataBuilder.build(issue_note, user)
+        hipchat.execute(data)
+
+        message = hipchat.send(:create_message, data)
+
+        obj_attr = data[:object_attributes]
+        issue_id = data[:issue]['iid']
+        title = data[:issue]['title']
+
+        expect(message).to eq("#{user.username} commented on " \
+            "<a href=\"#{obj_attr[:url]}\">issue ##{issue_id}</a> in " \
+            "<a href=\"#{project.web_url}\">#{project_name}</a>: " \
+            "<b>#{title}</b>" \
+            "<pre>issue note</pre>")
+      end
+
+      it "should call Hipchat API for snippet comment events" do
+        data = Gitlab::NoteDataBuilder.build(snippet_note, user)
+        hipchat.execute(data)
+
+        expect(WebMock).to have_requested(:post, api_url).once
+
+        message = hipchat.send(:create_message, data)
+
+        obj_attr = data[:object_attributes]
+        snippet_id = data[:snippet]['id']
+        title = data[:snippet]['title']
+
+        expect(message).to eq("#{user.username} commented on " \
+            "<a href=\"#{obj_attr[:url]}\">snippet ##{snippet_id}</a> in " \
+            "<a href=\"#{project.web_url}\">#{project_name}</a>: " \
+            "<b>#{title}</b>" \
+            "<pre>snippet note</pre>")
+      end
+    end
   end
 end
diff --git a/spec/models/project_services/slack_service/note_message_spec.rb b/spec/models/project_services/slack_service/note_message_spec.rb
new file mode 100644
index 00000000000..f2516c10008
--- /dev/null
+++ b/spec/models/project_services/slack_service/note_message_spec.rb
@@ -0,0 +1,129 @@
+require 'spec_helper'
+
+describe SlackService::NoteMessage do
+  let(:color) { '#345' }
+
+  before do
+    @args = {
+        user: {
+            name: 'Test User',
+            username: 'username',
+            avatar_url: 'http://fakeavatar'
+        },
+        project_name: 'project_name',
+        project_url: 'somewhere.com',
+        repository: {
+            name: 'project_name',
+            url: 'somewhere.com',
+        },
+        object_attributes: {
+            id: 10,
+            note: 'comment on a commit',
+            url: 'url',
+            noteable_type: 'Commit'
+        }
+    }
+  end
+
+  context 'commit notes' do
+    before do
+      @args[:object_attributes][:note] = 'comment on a commit'
+      @args[:object_attributes][:noteable_type] = 'Commit'
+      @args[:commit] = {
+          id: '5f163b2b95e6f53cbd428f5f0b103702a52b9a23',
+          message: "Added a commit message\ndetails\n123\n"
+      }
+    end
+
+    it 'returns a message regarding notes on commits' do
+      message = SlackService::NoteMessage.new(@args)
+      expect(message.pretext).to eq("username commented on " \
+      "<url|commit 5f163b2b> in <somewhere.com|project_name>: " \
+      "*Added a commit message*")
+      expected_attachments = [
+          {
+              text: "comment on a commit",
+              color: color,
+          }
+      ]
+      expect(message.attachments).to eq(expected_attachments)
+    end
+  end
+
+  context 'merge request notes' do
+    before do
+      @args[:object_attributes][:note] = 'comment on a merge request'
+      @args[:object_attributes][:noteable_type] = 'MergeRequest'
+      @args[:merge_request] = {
+          id: 1,
+          iid: 30,
+          title: "merge request title\ndetails\n"
+      }
+    end
+    it 'returns a message regarding notes on a merge request' do
+      message = SlackService::NoteMessage.new(@args)
+      expect(message.pretext).to eq("username commented on " \
+      "<url|merge request #30> in <somewhere.com|project_name>: " \
+      "*merge request title*")
+      expected_attachments =  [
+          {
+              text: "comment on a merge request",
+              color: color,
+          }
+      ]
+      expect(message.attachments).to eq(expected_attachments)
+    end
+  end
+
+  context 'issue notes' do
+    before do
+      @args[:object_attributes][:note] = 'comment on an issue'
+      @args[:object_attributes][:noteable_type] = 'Issue'
+      @args[:issue] = {
+          id: 1,
+          iid: 20,
+          title: "issue title\ndetails\n"
+      }
+    end
+
+    it 'returns a message regarding notes on an issue' do
+      message = SlackService::NoteMessage.new(@args)
+      expect(message.pretext).to eq(
+                                     "username commented on " \
+      "<url|issue #20> in <somewhere.com|project_name>: " \
+      "*issue title*")
+      expected_attachments =  [
+          {
+              text: "comment on an issue",
+              color: color,
+          }
+      ]
+      expect(message.attachments).to eq(expected_attachments)
+    end
+  end
+
+  context 'project snippet notes' do
+    before do
+      @args[:object_attributes][:note] = 'comment on a snippet'
+      @args[:object_attributes][:noteable_type] = 'Snippet'
+      @args[:snippet] = {
+          id: 5,
+          title: "snippet title\ndetails\n"
+      }
+    end
+
+    it 'returns a message regarding notes on a project snippet' do
+      message = SlackService::NoteMessage.new(@args)
+      expect(message.pretext).to eq("username commented on " \
+      "<url|snippet #5> in <somewhere.com|project_name>: " \
+      "*snippet title*")
+      expected_attachments =  [
+          {
+              text: "comment on a snippet",
+              color: color,
+          }
+      ]
+      expect(message.attachments).to eq(expected_attachments)
+    end
+  end
+end
diff --git a/spec/models/project_services/slack_service_spec.rb b/spec/models/project_services/slack_service_spec.rb
index 4e8a96ec730..c36506644b3 100644
--- a/spec/models/project_services/slack_service_spec.rb
+++ b/spec/models/project_services/slack_service_spec.rb
@@ -76,16 +76,16 @@ describe SlackService do
                                                    'open')
     end
 
-    it "should call Slack API for pull requests" do
+    it "should call Slack API for push events" do
       slack.execute(push_sample_data)
 
-      WebMock.should have_requested(:post, webhook_url).once
+      expect(WebMock).to have_requested(:post, webhook_url).once
     end
 
     it "should call Slack API for issue events" do
       slack.execute(@issues_sample_data)
 
-      WebMock.should have_requested(:post, webhook_url).once
+      expect(WebMock).to have_requested(:post, webhook_url).once
     end
 
     it "should call Slack API for merge requests events" do
@@ -97,10 +97,10 @@ describe SlackService do
     it 'should use the username as an option for slack when configured' do
       slack.stub(username: username)
       expect(Slack::Notifier).to receive(:new).
-        with(webhook_url, username: username).
-        and_return(
-          double(:slack_service).as_null_object
-        )
+       with(webhook_url, username: username).
+       and_return(
+         double(:slack_service).as_null_object
+       )
       slack.execute(push_sample_data)
     end
 
@@ -114,4 +114,57 @@ describe SlackService do
       slack.execute(push_sample_data)
     end
   end
+
+  describe "Note events" do
+    let(:slack)   { SlackService.new }
+    let(:user) { create(:user) }
+    let(:project) { create(:project, creator_id: user.id) }
+    let(:issue)         { create(:issue, project: project) }
+    let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
+    let(:snippet)       { create(:project_snippet, project: project) }
+    let(:commit_note) { create(:note_on_commit, author: user, project: project, commit_id: project.repository.commit.id, note: 'a comment on a commit') }
+    let(:merge_request_note) { create(:note_on_merge_request, noteable_id: merge_request.id, note: "merge request note") }
+    let(:issue_note) { create(:note_on_issue, noteable_id: issue.id, note: "issue note")}
+    let(:snippet_note) { create(:note_on_project_snippet, noteable_id: snippet.id, note: "snippet note") }
+    let(:webhook_url) { 'https://hooks.slack.com/services/SVRWFV0VVAR97N/B02R25XN3/ZBqu7xMupaEEICInN685' }
+
+    before do
+      slack.stub(
+          project: project,
+          project_id: project.id,
+          service_hook: true,
+          webhook: webhook_url
+      )
+
+      WebMock.stub_request(:post, webhook_url)
+    end
+
+    it "should call Slack API for commit comment events" do
+      data = Gitlab::NoteDataBuilder.build(commit_note, user)
+      slack.execute(data)
+
+      expect(WebMock).to have_requested(:post, webhook_url).once
+    end
+
+    it "should call Slack API for merge request comment events" do
+      data = Gitlab::NoteDataBuilder.build(merge_request_note, user)
+      slack.execute(data)
+
+      expect(WebMock).to have_requested(:post, webhook_url).once
+    end
+
+    it "should call Slack API for issue comment events" do
+      data = Gitlab::NoteDataBuilder.build(issue_note, user)
+      slack.execute(data)
+
+      expect(WebMock).to have_requested(:post, webhook_url).once
+    end
+
+    it "should call Slack API for snippet comment events" do
+      data = Gitlab::NoteDataBuilder.build(snippet_note, user)
+      slack.execute(data)
+
+      expect(WebMock).to have_requested(:post, webhook_url).once
+    end
+  end
 end