diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-03-04 14:01:54 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-03-04 14:01:54 +0000 |
| commit | df89c24e37af13fac084b44ae5f3f40769d7aa24 (patch) | |
| tree | 15198adb07ea66838cf6554848194fe173783878 /test/unit | |
| parent | 67d52acb848252d0f51045914f5219311ef01092 (diff) | |
| download | redmine-df89c24e37af13fac084b44ae5f3f40769d7aa24.tar.gz redmine-df89c24e37af13fac084b44ae5f3f40769d7aa24.zip | |
Adds an helper to get the body of an email in tests.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9092 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/lib/redmine/hook_test.rb | 2 | ||||
| -rw-r--r-- | test/unit/mail_handler_test.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/unit/lib/redmine/hook_test.rb b/test/unit/lib/redmine/hook_test.rb index 14782683a..1b0034c95 100644 --- a/test/unit/lib/redmine/hook_test.rb +++ b/test/unit/lib/redmine/hook_test.rb @@ -158,7 +158,7 @@ class Redmine::Hook::ManagerTest < ActiveSupport::TestCase Mailer.deliver_issue_add(issue) mail2 = ActionMailer::Base.deliveries.last - assert_equal mail.body, mail2.body + assert_equal mail_body(mail), mail_body(mail2) end def hook_helper diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb index 218625f74..bf38048db 100644 --- a/test/unit/mail_handler_test.rb +++ b/test/unit/mail_handler_test.rb @@ -272,8 +272,8 @@ class MailHandlerTest < ActiveSupport::TestCase email = ActionMailer::Base.deliveries.first assert_not_nil email assert email.subject.include?('account activation') - login = email.body.match(/\* Login: (.*)$/)[1] - password = email.body.match(/\* Password: (.*)$/)[1] + login = mail_body(email).match(/\* Login: (.*)$/)[1] + password = mail_body(email).match(/\* Password: (.*)$/)[1] assert_equal issue.author, User.try_to_login(login, password) end end |