From 850a889a3e2154c2cdf7c5459944a6a1d1042b06 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Mon, 6 May 2019 23:34:10 +0000 Subject: [PATCH] Fix tests to test Mailer.deliver_issue_edit instead of Mailer.deliver_issue_add (#13111, #31065). Patch by Mizuki ISHIKAWA. git-svn-id: http://svn.redmine.org/redmine/trunk@18134 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/unit/mailer_test.rb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb index c78783375..7b77b8997 100644 --- a/test/unit/mailer_test.rb +++ b/test/unit/mailer_test.rb @@ -462,10 +462,12 @@ class MailerTest < ActiveSupport::TestCase 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) - issue.status_id = 4 - issue.save! - Mailer.deliver_issue_add(issue) + issue.init_journal(User.current) + issue.update(:status_id => 4) + journal = issue.journals.last + Mailer.deliver_issue_edit(journal) + assert journal.new_value_for('status_id') mail = last_email assert_equal "[eCookbook - Feature request #2] (Feedback) Add ingredients categories", mail.subject end @@ -474,10 +476,12 @@ class MailerTest < ActiveSupport::TestCase def test_issue_edit_subject_should_not_include_status_changes_if_setting_is_disabled with_settings :show_status_changes_in_mail_subject => 0 do issue = Issue.find(2) - issue.status_id = 4 - issue.save! - Mailer.deliver_issue_add(issue) + issue.init_journal(User.current) + issue.update(:status_id => 4) + journal = issue.journals.last + Mailer.deliver_issue_edit(journal) + assert journal.new_value_for('status_id') mail = last_email assert_equal "[eCookbook - Feature request #2] Add ingredients categories", mail.subject end -- 2.39.5