Test if reopen notifications are sent.

2 files changed, 38 insertions, 1 deletions

diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb
index 354c58678d5..2b5af09a576 100644
--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
@@ -49,7 +49,6 @@ module Emails
       @updated_by = User.find updated_by_user_id
       @target_url = project_merge_request_url(@project, @merge_request)
       set_reference("merge_request_#{merge_request_id}")
-
       mail(from: sender(updated_by_user_id),
            to: recipient(recipient_id),
            subject: subject("#{@merge_request.title} (##{@merge_request.iid}) #{@mr_status}"))
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 644109848b4..df355f6f07a 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -242,6 +242,26 @@ describe NotificationService do
         Notify.should_not_receive(:closed_issue_email).with(user_id, issue.id, @u_disabled.id)
       end
     end
+
+    describe :reopen_issue do
+      it 'should send email to issue assignee and issue author' do
+        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.reopen_issue(issue, @u_disabled)
+      end
+
+      def should_email(user_id)
+        Notify.should_receive(:issue_status_changed_email).with(user_id, issue.id, 'reopened', @u_disabled.id)
+      end
+
+      def should_not_email(user_id)
+        Notify.should_not_receive(:issue_status_changed_email).with(user_id, issue.id, 'reopened', @u_disabled.id)
+      end
+    end
   end
 
   describe 'Merge Requests' do
@@ -322,6 +342,24 @@ describe NotificationService do
         Notify.should_not_receive(:merged_merge_request_email).with(user_id, merge_request.id, @u_disabled.id)
       end
     end
+
+    describe :reopen_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.reopen_mr(merge_request, @u_disabled)
+      end
+
+      def should_email(user_id)
+        Notify.should_receive(:merge_request_status_email).with(user_id, merge_request.id, 'reopened', @u_disabled.id)
+      end
+
+      def should_not_email(user_id)
+        Notify.should_not_receive(:merge_request_status_email).with(user_id, merge_request.id, 'reopened', @u_disabled.id)
+      end
+    end
   end
 
   describe 'Projects' do