第17回作業分

Author: juno-nishizaki

app/models/mailer.rb

@@ -70,7 +70,7 @@ def self.default_url_options
   end
 
   # Builds a mail for notifying user about a new issue
-  def issue_add(user, issue, recipients)
+  def issue_add(user, issue, recipients=nil)
     redmine_headers 'Project' => issue.project.identifier,
                     'Issue-Tracker' => issue.tracker.name,
                     'Issue-Id' => issue.id,
@@ -102,7 +102,7 @@ def self.deliver_issue_add(issue)
   end
 
   # Builds a mail for notifying user about an issue update
-  def issue_edit(user, journal, recipients)
+  def issue_edit(user, journal, recipients=nil)
     issue = journal.journalized
     redmine_headers 'Project' => issue.project.identifier,
                     'Issue-Tracker' => issue.tracker.name,
@@ -141,7 +141,7 @@ def self.deliver_issue_edit(journal)
   end
 
   # Builds a mail to user about a new document.
-  def document_added(user, document, author, recipients)
+  def document_added(user, document, author, recipients=nil)
     redmine_headers 'Project' => document.project.identifier
     @author = author
     @document = document

test/unit/mailer_test.rb

@@ -517,6 +517,21 @@ def test_issue_add_should_include_issue_status_type_badge
     end
   end
 
+  def test_issue_add_should_include_recipients_on_mail_footer
+    with_settings :show_recipients_in_mail_footer => '1' do
+      issue = Issue.find(1)
+      Mailer.deliver_issue_add(issue)
+      mail = last_email
+      assert_select_email do
+        assert_select 'span.recipients' do |span|
+          assert_include 'The following recipients have also received this email.', span.text
+          assert_include 'John Smith', span.text
+          assert_include 'Dave Lopper', span.text
+        end
+      end
+    end
+  end
+
   def test_issue_edit_subject_should_include_status_changes_if_setting_is_enabled
     with_settings :show_status_changes_in_mail_subject => 1 do
       issue = Issue.find(2)
@@ -608,6 +623,40 @@ def test_issue_edit_with_relation_should_notify_users_who_can_see_the_related_is
     end
   end
 
+  def test_issue_edit_should_include_recipients_on_mail_footer
+    with_settings :show_recipients_in_mail_footer => '1' do
+      issue = Issue.find(1)
+      issue.init_journal(User.current)
+      issue.update(:status_id => 4)
+      journal = issue.journals.last
+      Mailer.deliver_issue_edit(journal)
+      mail = last_email
+      assert_select_email do
+        assert_select 'span.recipients' do |span|
+          assert_include 'The following recipients have also received this email.', span.text
+          assert_include 'John Smith', span.text
+          assert_include 'Dave Lopper', span.text
+        end
+      end
+    end
+  end
+
+  def test_document_added_should_include_recipients_on_mail_footer
+    with_settings :show_recipients_in_mail_footer => '1' do
+      document = Document.find(1)
+      author = User.find(2)
+      Mailer.deliver_document_added(document, author)
+      mail = last_email
+      assert_select_email do
+        assert_select 'span.recipients' do |span|
+          assert_include 'The following recipients have also received this email.', span.text
+          assert_include 'John Smith', span.text
+          assert_include 'Dave Lopper', span.text
+        end
+      end
+    end
+  end
+
   def test_issue_should_send_email_notification_with_suppress_empty_fields
     ActionMailer::Base.deliveries.clear
     with_settings :notified_events => %w(issue_added) do