Merge pull request #5076 from jzi/notify_commit_author

Re-enable notifying commit authors of new commit notes

app/services/notification_service.rb

@@ -107,12 +107,6 @@ class NotificationService
 
     opts = { noteable_type: note.noteable_type, project_id: note.project_id }
 
-    if note.commit_id.present?
-      opts.merge!(commit_id: note.commit_id)
-    else
-      opts.merge!(noteable_id: note.noteable_id)
-    end
-
     target = note.noteable
     if target.respond_to?(:participants)
       recipients = target.participants
@@ -120,6 +114,13 @@ class NotificationService
       recipients = note.mentioned_users
     end
 
+    if note.commit_id.present?
+      opts.merge!(commit_id: note.commit_id)
+      recipients << note.commit_author
+    else
+      opts.merge!(noteable_id: note.noteable_id)
+    end
+
     # Get users who left comment in thread
     recipients = recipients.concat(User.where(id: Note.where(opts).pluck(:author_id)))
 

spec/services/notification_service_spec.rb

@@ -52,10 +52,12 @@ describe NotificationService do
 
       before do
         build_team(note.project)
+        note.stub(:commit_author => @u_committer)
       end
 
       describe :new_note do
         it do
+          should_email(@u_committer.id, note)
           should_email(@u_watcher.id, note)
           should_not_email(@u_mentioned.id, note)
           should_not_email(note.author_id, note)
@@ -65,18 +67,14 @@ describe NotificationService do
         end
 
         it do
-          new_note = create(:note_on_commit,
-                 author: @u_participating,
-                 project_id: note.project_id,
-                 commit_id: note.commit_id,
-                 note: '@mention referenced')
-
-          should_email(@u_watcher.id, new_note)
-          should_email(@u_mentioned.id, new_note)
-          should_not_email(new_note.author_id, new_note)
-          should_not_email(@u_participating.id, new_note)
-          should_not_email(@u_disabled.id, new_note)
-          notification.new_note(new_note)
+          note.update_attribute(:note, '@mention referenced')
+          should_email(@u_committer.id, note)
+          should_email(@u_watcher.id, note)
+          should_email(@u_mentioned.id, note)
+          should_not_email(note.author_id, note)
+          should_not_email(@u_participating.id, note)
+          should_not_email(@u_disabled.id, note)
+          notification.new_note(note)
         end
 
         def should_email(user_id, n)
@@ -240,10 +238,12 @@ describe NotificationService do
     @u_participating = create(:user, notification_level: Notification::N_PARTICIPATING)
     @u_disabled = create(:user, notification_level: Notification::N_DISABLED)
     @u_mentioned = create(:user, username: 'mention', notification_level: Notification::N_PARTICIPATING)
+    @u_committer = create(:user, username: 'committer')
 
     project.team << [@u_watcher, :master]
     project.team << [@u_participating, :master]
     project.team << [@u_disabled, :master]
     project.team << [@u_mentioned, :master]
+    project.team << [@u_committer, :master]
   end
 end