jro_apps/redmine Commit - r8972:df89c24e37af

Adds an helper to get the body of an email in tests....

Jean-Philippe Lang -

r8972:df89c24e37af

parent child

Context file:

r8972:df89c24e37af

test/test_helper.rb +8 -4

               def assert_mail_body_match(expected, mail)
                 if expected.is_a?(String)
-                  assert_include expected, mail.body
+                  assert_include expected, mail_body(mail)
                 else
-                  assert_match expected, mail.body
+                  assert_match expected, mail_body(mail)
                 end
               end
               def assert_mail_body_no_match(expected, mail)
                 if expected.is_a?(String)
-                  assert_not_include expected, mail.body
+                  assert_not_include expected, mail_body(mail)
                 else
-                  assert_no_match expected, mail.body
+                  assert_no_match expected, mail_body(mail)
                 end
               end
+              def mail_body(mail)
+                mail.body
+              end
               # Shoulda macros
               def self.should_render_404
                 should_respond_with :not_found

test/unit/lib/redmine/hook_test.rb +1 -1

                 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

test/unit/mail_handler_test.rb +2 -2

                   email = ActionMailer::Base.deliveries.first
                   assert_not_nil email
                   assert email.subject.include?('account activation')
-                  login = email.body.match(/\* Login: (.*)$/)[1]
+                  login = mail_body(email).match(/\* Login: (.*)$/)[1]
-                  password = email.body.match(/\* Password: (.*)$/)[1]
+                  password = mail_body(email).match(/\* Password: (.*)$/)[1]
                   assert_equal issue.author, User.try_to_login(login, password)
                 end
               end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages