From 15d7cac282e29f0a8e7b38dade07abb32d97a991 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Thu, 12 Nov 2009 16:08:50 +1100 Subject: Starting again on actionmailer integration with mail --- actionmailer/test/mail_helper_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer/test/mail_helper_test.rb') diff --git a/actionmailer/test/mail_helper_test.rb b/actionmailer/test/mail_helper_test.rb index f8b002e0a7..7b0716048f 100644 --- a/actionmailer/test/mail_helper_test.rb +++ b/actionmailer/test/mail_helper_test.rb @@ -55,7 +55,7 @@ end class MailerHelperTest < Test::Unit::TestCase def new_mail( charset="utf-8" ) - mail = TMail::Mail.new + mail = Mail.new mail.set_content_type "text", "plain", { "charset" => charset } if charset mail end -- cgit v1.2.3 From 539d9b355f40b1668b4ad4e8fe628e0a3d9760b8 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Fri, 20 Nov 2009 14:10:57 +1100 Subject: More updates... 45 errors left to get it working with Mail gem --- actionmailer/test/mail_helper_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer/test/mail_helper_test.rb') diff --git a/actionmailer/test/mail_helper_test.rb b/actionmailer/test/mail_helper_test.rb index 7b0716048f..a5cf789035 100644 --- a/actionmailer/test/mail_helper_test.rb +++ b/actionmailer/test/mail_helper_test.rb @@ -56,7 +56,7 @@ end class MailerHelperTest < Test::Unit::TestCase def new_mail( charset="utf-8" ) mail = Mail.new - mail.set_content_type "text", "plain", { "charset" => charset } if charset + mail.content_type ["text", "plain", { "charset" => charset }] mail end -- cgit v1.2.3 From a5e6295d72733b0ab4d5cff1003574e98913bae8 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Fri, 20 Nov 2009 21:19:10 +1100 Subject: Down to 30 failures total --- actionmailer/test/mail_helper_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer/test/mail_helper_test.rb') diff --git a/actionmailer/test/mail_helper_test.rb b/actionmailer/test/mail_helper_test.rb index a5cf789035..b750d21f8a 100644 --- a/actionmailer/test/mail_helper_test.rb +++ b/actionmailer/test/mail_helper_test.rb @@ -56,7 +56,7 @@ end class MailerHelperTest < Test::Unit::TestCase def new_mail( charset="utf-8" ) mail = Mail.new - mail.content_type ["text", "plain", { "charset" => charset }] + mail.content_type(["text", "plain", { "charset" => charset }]) mail end -- cgit v1.2.3 From f6f70540bbb77a80df0949d0c9e57239bca10132 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Sun, 22 Nov 2009 00:04:36 +1100 Subject: Updating tests for Mail gem --- actionmailer/test/mail_helper_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer/test/mail_helper_test.rb') 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 -- cgit v1.2.3 From 63b124b043dec036403f9a88aeafdf99669064e0 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Thu, 17 Dec 2009 12:23:08 +1100 Subject: Merged in latest changes from rails/master --- actionmailer/test/mail_helper_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer/test/mail_helper_test.rb') diff --git a/actionmailer/test/mail_helper_test.rb b/actionmailer/test/mail_helper_test.rb index d04215171d..2d3565d159 100644 --- a/actionmailer/test/mail_helper_test.rb +++ b/actionmailer/test/mail_helper_test.rb @@ -56,7 +56,7 @@ end class MailerHelperTest < Test::Unit::TestCase def new_mail( charset="utf-8" ) mail = Mail.new - mail.content_type(["text", "plain", { "charset" => charset }]) + mail.set_content_type "text", "plain", { "charset" => charset } if charset mail end -- cgit v1.2.3