Adds helpers for testing email body.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9086 e93f8b46-1217-0410-a6f0-8f06a7374b81

4 files changed, 12 insertions, 12 deletions

diff --git a/test/functional/files_controller_test.rb b/test/functional/files_controller_test.rb
index e37cc855e..d05557990 100644
--- a/test/functional/files_controller_test.rb
+++ b/test/functional/files_controller_test.rb
@@ -74,7 +74,7 @@ class FilesControllerTest < ActionController::TestCase
     mail = ActionMailer::Base.deliveries.last
     assert_not_nil mail
     assert_equal "[eCookbook] New file", mail.subject
-    assert mail.body.include?('testfile.txt')
+    assert_mail_body_match 'testfile.txt', mail
   end
 
   def test_create_version_file
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 168574ebb..d177a71c2 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -2164,7 +2164,7 @@ class IssuesControllerTest < ActionController::TestCase
     mail = ActionMailer::Base.deliveries.last
     assert_not_nil mail
     assert mail.subject.starts_with?("[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}]")
-    assert mail.body.include?("Subject changed from #{old_subject} to #{new_subject}")
+    assert_mail_body_match "Subject changed from #{old_subject} to #{new_subject}", mail
   end
 
   def test_put_update_with_project_change
@@ -2190,7 +2190,7 @@ class IssuesControllerTest < ActionController::TestCase
     mail = ActionMailer::Base.deliveries.last
     assert_not_nil mail
     assert mail.subject.starts_with?("[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}]")
-    assert mail.body.include?("Project changed from eCookbook to OnlineStore")
+    assert_mail_body_match "Project changed from eCookbook to OnlineStore", mail
   end
 
   def test_put_update_with_tracker_change
@@ -2215,7 +2215,7 @@ class IssuesControllerTest < ActionController::TestCase
     mail = ActionMailer::Base.deliveries.last
     assert_not_nil mail
     assert mail.subject.starts_with?("[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}]")
-    assert mail.body.include?("Tracker changed from Bug to Feature request")
+    assert_mail_body_match "Tracker changed from Bug to Feature request", mail
   end
 
   def test_put_update_with_custom_field_change
@@ -2238,7 +2238,7 @@ class IssuesControllerTest < ActionController::TestCase
 
     mail = ActionMailer::Base.deliveries.last
     assert_not_nil mail
-    assert mail.body.include?("Searchable field changed from 125 to New custom value")
+    assert_mail_body_match "Searchable field changed from 125 to New custom value", mail
   end
 
   def test_put_update_with_multi_custom_field_change
@@ -2281,7 +2281,7 @@ class IssuesControllerTest < ActionController::TestCase
     assert_equal 2, j.details.size
 
     mail = ActionMailer::Base.deliveries.last
-    assert mail.body.include?("Status changed from New to Assigned")
+    assert_mail_body_match "Status changed from New to Assigned", mail
     # subject should contain the new status
     assert mail.subject.include?("(#{ IssueStatus.find(2).name })")
   end
@@ -2299,7 +2299,7 @@ class IssuesControllerTest < ActionController::TestCase
     assert_equal User.anonymous, j.user
 
     mail = ActionMailer::Base.deliveries.last
-    assert mail.body.include?(notes)
+    assert_mail_body_match notes, mail
   end
 
   def test_put_update_with_note_and_spent_time
@@ -2357,7 +2357,7 @@ class IssuesControllerTest < ActionController::TestCase
     assert_equal 59, File.size(attachment.diskfile)
 
     mail = ActionMailer::Base.deliveries.last
-    assert mail.body.include?('testfile.txt')
+    assert_mail_body_match 'testfile.txt', mail
   end
 
   def test_put_update_with_failure_should_save_attachments
diff --git a/test/functional/messages_controller_test.rb b/test/functional/messages_controller_test.rb
index b24a444d8..70df6f0b5 100644
--- a/test/functional/messages_controller_test.rb
+++ b/test/functional/messages_controller_test.rb
@@ -106,7 +106,7 @@ class MessagesControllerTest < ActionController::TestCase
     mail = ActionMailer::Base.deliveries.last
     assert_not_nil mail
     assert_equal "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] Test created message", mail.subject
-    assert mail.body.include?('Message body')
+    assert_mail_body_match 'Message body', mail
     # author
     assert mail.bcc.include?('jsmith@somenet.foo')
     # project member
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index ca805d4a1..11e5acc3c 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -191,7 +191,7 @@ class UsersControllerTest < ActionController::TestCase
     mail = ActionMailer::Base.deliveries.last
     assert_not_nil mail
     assert_equal [user.mail], mail.bcc
-    assert mail.body.include?('secret')
+    assert_mail_body_match 'secret', mail
   end
 
   def test_create_with_preferences
@@ -279,7 +279,7 @@ class UsersControllerTest < ActionController::TestCase
     mail = ActionMailer::Base.deliveries.last
     assert_not_nil mail
     assert_equal ['foo.bar@somenet.foo'], mail.bcc
-    assert mail.body.include?(ll('fr', :notice_account_activated))
+    assert_mail_body_match ll('fr', :notice_account_activated), mail
   end
 
   def test_update_with_password_change_should_send_a_notification
@@ -293,7 +293,7 @@ class UsersControllerTest < ActionController::TestCase
     mail = ActionMailer::Base.deliveries.last
     assert_not_nil mail
     assert_equal [u.mail], mail.bcc
-    assert mail.body.include?('newpass')
+    assert_mail_body_match 'newpass', mail
   end
 
   test "put :update with a password change to an AuthSource user switching to Internal authentication" do