aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorMikel Lindsaar <raasdnil@gmail.com>2009-11-22 00:04:36 +1100
committerMikel Lindsaar <raasdnil@gmail.com>2009-11-22 00:04:36 +1100
commitf6f70540bbb77a80df0949d0c9e57239bca10132 (patch)
treebc1b97202e4f4329b2a4c91b8eacb03d133517c6 /actionmailer
parent0e38f5bdccf7465ea05090db2a4a2659aa3012ea (diff)
downloadrails-f6f70540bbb77a80df0949d0c9e57239bca10132.tar.gz
rails-f6f70540bbb77a80df0949d0c9e57239bca10132.tar.bz2
rails-f6f70540bbb77a80df0949d0c9e57239bca10132.zip
Updating tests for Mail gem
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/test/mail_helper_test.rb2
-rw-r--r--actionmailer/test/mail_service_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/test/mail_helper_test.rb b/actionmailer/test/mail_helper_test.rb
index b750d21f8a..d04215171d 100644
--- a/actionmailer/test/mail_helper_test.rb
+++ b/actionmailer/test/mail_helper_test.rb
@@ -90,7 +90,7 @@ class MailerHelperTest < Test::Unit::TestCase
def test_use_mail_helper
mail = HelperMailer.create_use_mail_helper(@recipient)
assert_match %r{ But soft!}, mail.encoded
- assert_match %r{east, and\n Juliet}, mail.encoded
+ assert_match %r{east, and\r\n Juliet}, mail.encoded
end
end
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb
index cfa4c32b1c..6ed7f20837 100644
--- a/actionmailer/test/mail_service_test.rb
+++ b/actionmailer/test/mail_service_test.rb
@@ -695,7 +695,7 @@ The body
EOF
mail = Mail.new(msg)
assert_equal "testing testing \326\244", mail.subject.decoded
- assert_equal "=?utf-8?Q?testing_testing_=D6=A4?=", mail.quoted_subject
+ assert_equal "Subject: =?utf-8?Q?testing_testing_=D6=A4?=\r\n", mail.subject.encoded
end
def test_unquote_7bit_subject