diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-03-04 13:28:18 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-03-04 13:28:18 +0000 |
| commit | 3aaf2b9ed00751d0aa793c98861513ac5302ec10 (patch) | |
| tree | d497313144509b6bb0a43c2a10e395424549dcfe /test/unit | |
| parent | b1d5f42237295895412ff559f3f65a05cd65cf96 (diff) | |
| download | redmine-3aaf2b9ed00751d0aa793c98861513ac5302ec10.tar.gz redmine-3aaf2b9ed00751d0aa793c98861513ac5302ec10.zip | |
Adds helpers for testing email body.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9086 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/mailer_test.rb | 8 | ||||
| -rw-r--r-- | test/unit/repository_test.rb | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb index 6d652cb23..5607d1636 100644 --- a/test/unit/mailer_test.rb +++ b/test/unit/mailer_test.rb @@ -470,7 +470,7 @@ class MailerTest < ActiveSupport::TestCase assert_equal 1, ActionMailer::Base.deliveries.size mail = last_email assert mail.bcc.include?('dlopper@somenet.foo') - assert mail.body.include?('Bug #3: Error 281 when updating a recipe') + assert_mail_body_match 'Bug #3: Error 281 when updating a recipe', mail assert_equal '1 issue(s) due in the next 42 days', mail.subject end @@ -486,7 +486,7 @@ class MailerTest < ActiveSupport::TestCase assert_equal 1, ActionMailer::Base.deliveries.size mail = last_email assert mail.bcc.include?('dlopper@somenet.foo') - assert !mail.body.include?('Closed issue') + assert_mail_body_no_match 'Closed issue', mail end end @@ -497,7 +497,7 @@ class MailerTest < ActiveSupport::TestCase assert_equal 1, ActionMailer::Base.deliveries.size # No mail for dlopper mail = last_email assert mail.bcc.include?('dlopper@somenet.foo') - assert mail.body.include?('Bug #3: Error 281 when updating a recipe') + assert_mail_body_match 'Bug #3: Error 281 when updating a recipe', mail end def last_email @@ -515,7 +515,7 @@ class MailerTest < ActiveSupport::TestCase user.language = 'fr' Mailer.deliver_account_activated(user) mail = last_email - assert mail.body.include?('Votre compte') + assert_mail_body_match 'Votre compte', mail assert_equal :it, current_language end diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb index db0620d16..96f0ceeee 100644 --- a/test/unit/repository_test.rb +++ b/test/unit/repository_test.rb @@ -176,8 +176,8 @@ class RepositoryTest < ActiveSupport::TestCase assert_not_nil mail assert mail.subject.starts_with?( "[#{fixed_issue.project.name} - #{fixed_issue.tracker.name} ##{fixed_issue.id}]") - assert mail.body.include?( - "Status changed from #{old_status} to #{fixed_issue.status}") + assert_mail_body_match( + "Status changed from #{old_status} to #{fixed_issue.status}", mail) # ignoring commits referencing an issue of another project assert_equal [], Issue.find(4).changesets |