add watchers to email recipients list. Add emails for close/merge MR

spec/services/notification_service_spec.rb

@@ -23,6 +23,10 @@ describe NotificationService do
   describe 'Issues' do
     let(:issue) { create :issue, assignee: create(:user) }
 
+    before do
+      build_team(issue.project)
+    end
+
     describe :new_issue do
       it 'should sent email to issue assignee' do
         Notify.should_receive(:new_issue_email).with(issue.id)
@@ -31,16 +35,41 @@ describe NotificationService do
     end
 
     describe :reassigned_issue do
-      it 'should sent email to issue old assignee and new issue assignee' do
-        Notify.should_receive(:reassigned_issue_email)
-        notification.reassigned_issue(issue, issue.author)
+      it 'should email new assignee' do
+        should_email(issue.assignee_id)
+        should_email(@u_watcher.id)
+        should_not_email(@u_participating.id)
+        should_not_email(@u_disabled.id)
+
+        notification.reassigned_issue(issue, @u_disabled)
+      end
+
+      def should_email(user_id)
+        Notify.should_receive(:reassigned_issue_email).with(user_id, issue.id, issue.assignee_id)
+      end
+
+      def should_not_email(user_id)
+        Notify.should_not_receive(:reassigned_issue_email).with(user_id, issue.id, issue.assignee_id)
       end
     end
 
     describe :close_issue do
       it 'should sent email to issue assignee and issue author' do
-        Notify.should_receive(:issue_status_changed_email)
-        notification.close_issue(issue, issue.author)
+        should_email(issue.assignee_id)
+        should_email(issue.author_id)
+        should_email(@u_watcher.id)
+        should_not_email(@u_participating.id)
+        should_not_email(@u_disabled.id)
+
+        notification.close_issue(issue, @u_disabled)
+      end
+
+      def should_email(user_id)
+        Notify.should_receive(:issue_status_changed_email).with(user_id, issue.id, issue.assignee_id)
+      end
+
+      def should_not_email(user_id)
+        Notify.should_not_receive(:issue_status_changed_email).with(user_id, issue.id, issue.assignee_id)
       end
     end
   end
@@ -48,16 +77,90 @@ describe NotificationService do
   describe 'Merge Requests' do
     let(:merge_request) { create :merge_request, assignee: create(:user) }
 
+    before do
+      build_team(merge_request.project)
+    end
+
     describe :new_merge_request do
-      it 'should send email to merge_request assignee' do
-        Notify.should_receive(:new_merge_request_email).with(merge_request.id)
-        notification.new_merge_request(merge_request, merge_request.author)
+      it do
+        should_email(merge_request.assignee_id)
+        should_email(@u_watcher.id)
+        should_not_email(@u_participating.id)
+        should_not_email(@u_disabled.id)
+        notification.new_merge_request(merge_request, @u_disabled)
       end
 
-      it 'should not send email to merge_request assignee if he is current_user' do
+      def should_email(user_id)
+        Notify.should_receive(:new_merge_request_email).with(merge_request.id)
+      end
+
+      def should_not_email(user_id)
         Notify.should_not_receive(:new_merge_request_email).with(merge_request.id)
-        notification.new_merge_request(merge_request, merge_request.assignee)
+      end
+    end
+
+    describe :reassigned_merge_request do
+      it do
+        should_email(merge_request.assignee_id)
+        should_email(@u_watcher.id)
+        should_not_email(@u_participating.id)
+        should_not_email(@u_disabled.id)
+        notification.reassigned_merge_request(merge_request, merge_request.author)
+      end
+
+      def should_email(user_id)
+        Notify.should_receive(:reassigned_merge_request_email).with(user_id, merge_request.id, merge_request.assignee_id)
+      end
+
+      def should_not_email(user_id)
+        Notify.should_not_receive(:reassigned_merge_request_email).with(user_id, merge_request.id, merge_request.assignee_id)
+      end
+    end
+
+    describe :closed_merge_request do
+      it do
+        should_email(merge_request.assignee_id)
+        should_email(@u_watcher.id)
+        should_not_email(@u_participating.id)
+        should_not_email(@u_disabled.id)
+        notification.close_mr(merge_request)
+      end
+
+      def should_email(user_id)
+        Notify.should_receive(:closed_merge_request_email).with(user_id, merge_request.id)
+      end
+
+      def should_not_email(user_id)
+        Notify.should_not_receive(:closed_merge_request_email).with(user_id, merge_request.id)
+      end
+    end
+
+    describe :merged_merge_request do
+      it do
+        should_email(merge_request.assignee_id)
+        should_email(@u_watcher.id)
+        should_not_email(@u_participating.id)
+        should_not_email(@u_disabled.id)
+        notification.merge_mr(merge_request)
+      end
+
+      def should_email(user_id)
+        Notify.should_receive(:merged_merge_request_email).with(user_id, merge_request.id)
+      end
+
+      def should_not_email(user_id)
+        Notify.should_not_receive(:merged_merge_request_email).with(user_id, merge_request.id)
       end
     end
   end
+
+  def build_team(project)
+    @u_watcher = create(:user, notification_level: Notification::N_WATCH)
+    @u_participating = create(:user, notification_level: Notification::N_PARTICIPATING)
+    @u_disabled = create(:user, notification_level: Notification::N_DISABLED)
+
+    project.team << [@u_watcher, :master]
+    project.team << [@u_participating, :master]
+    project.team << [@u_disabled, :master]
+  end
 end