1 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/test/mail_helper_test.rb b/actionmailer/test/mail_helper_test.rb
index f8b002e0a7..d04215171d 100644
--- a/actionmailer/test/mail_helper_test.rb
+++ b/actionmailer/test/mail_helper_test.rb
@@ -55,8 +55,8 @@ end
 
 class MailerHelperTest < Test::Unit::TestCase
   def new_mail( charset="utf-8" )
-    mail = TMail::Mail.new
-    mail.set_content_type "text", "plain", { "charset" => charset } if charset
+    mail = Mail.new
+    mail.content_type(["text", "plain", { "charset" => charset }])
     mail
   end
 
@@ -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