aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-08-14 05:58:34 -0300
committerXavier Noria <fxn@hashref.com>2010-08-14 13:17:32 +0200
commit9dc88aba47db3faf6b28ac9317fe26e63779e17c (patch)
tree338ac85055965e0e2a0867f0652d238d1b2421ff /actionmailer
parentb95d6e84b00bd926b1118f6a820eca7a870b8c35 (diff)
downloadrails-9dc88aba47db3faf6b28ac9317fe26e63779e17c.tar.gz
rails-9dc88aba47db3faf6b28ac9317fe26e63779e17c.tar.bz2
rails-9dc88aba47db3faf6b28ac9317fe26e63779e17c.zip
Fixes some ActionMailer tests
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/test/old_base/mail_render_test.rb2
-rw-r--r--actionmailer/test/old_base/mail_service_test.rb4
-rw-r--r--actionmailer/test/old_base/url_test.rb2
3 files changed, 4 insertions, 4 deletions
diff --git a/actionmailer/test/old_base/mail_render_test.rb b/actionmailer/test/old_base/mail_render_test.rb
index 08951833a5..bf489e77d4 100644
--- a/actionmailer/test/old_base/mail_render_test.rb
+++ b/actionmailer/test/old_base/mail_render_test.rb
@@ -112,7 +112,7 @@ class RenderHelperTest < Test::Unit::TestCase
def test_file_template
mail = RenderMailer.file_template
- assert_equal "Hello there, \n\nMr. test@localhost", mail.body.to_s.strip
+ assert_equal "Hello there,\n\nMr. test@localhost", mail.body.to_s.strip
end
def test_rxml_template
diff --git a/actionmailer/test/old_base/mail_service_test.rb b/actionmailer/test/old_base/mail_service_test.rb
index 4c93eb63e2..a216b94a55 100644
--- a/actionmailer/test/old_base/mail_service_test.rb
+++ b/actionmailer/test/old_base/mail_service_test.rb
@@ -392,7 +392,7 @@ class ActionMailerTest < Test::Unit::TestCase
expected = new_mail
expected.to = @recipient
expected.subject = "[Signed up] Welcome #{@recipient}"
- expected.body = "Hello there, \n\nMr. #{@recipient}"
+ expected.body = "Hello there,\n\nMr. #{@recipient}"
expected.from = "system@loudthinking.com"
expected.date = Time.now
@@ -420,7 +420,7 @@ class ActionMailerTest < Test::Unit::TestCase
expected = new_mail
expected.to = @recipient
expected.subject = "[Signed up] Welcome #{@recipient}"
- expected.body = "Hello there, \n\nMr. #{@recipient}"
+ expected.body = "Hello there,\n\nMr. #{@recipient}"
expected.from = "system@loudthinking.com"
expected.date = Time.local(2004, 12, 12)
diff --git a/actionmailer/test/old_base/url_test.rb b/actionmailer/test/old_base/url_test.rb
index b4be7dfe32..573186dbee 100644
--- a/actionmailer/test/old_base/url_test.rb
+++ b/actionmailer/test/old_base/url_test.rb
@@ -68,7 +68,7 @@ class ActionMailerUrlTest < ActionMailer::TestCase
expected = new_mail
expected.to = @recipient
expected.subject = "[Signed up] Welcome #{@recipient}"
- expected.body = "Hello there, \n\nMr. #{@recipient}. Please see our greeting at http://example.com/welcome/greeting http://www.basecamphq.com/welcome\n\n<img alt=\"Somelogo\" src=\"/images/somelogo.png\" />"
+ expected.body = "Hello there,\n\nMr. #{@recipient}. Please see our greeting at http://example.com/welcome/greeting http://www.basecamphq.com/welcome\n\n<img alt=\"Somelogo\" src=\"/images/somelogo.png\" />"
expected.from = "system@loudthinking.com"
expected.date = Time.local(2004, 12, 12)