aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorMikel Lindsaar <raasdnil@gmail.com>2010-04-10 16:11:46 +1000
committerMikel Lindsaar <raasdnil@gmail.com>2010-04-11 18:04:56 +1000
commitbd89c391e81c82f72508118a1f6d19274463c182 (patch)
tree10e76fc549e6ff1c7a4e0c7f0e1e7b699003e5e6 /actionmailer
parentfd9ee49f38bbc845fe1ac61d6e85a9304bdfb902 (diff)
downloadrails-bd89c391e81c82f72508118a1f6d19274463c182.tar.gz
rails-bd89c391e81c82f72508118a1f6d19274463c182.tar.bz2
rails-bd89c391e81c82f72508118a1f6d19274463c182.zip
Cleaning up expectations from the new way mail does it
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/test/old_base/mail_service_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/test/old_base/mail_service_test.rb b/actionmailer/test/old_base/mail_service_test.rb
index b68e7fcbac..32ed9fc870 100644
--- a/actionmailer/test/old_base/mail_service_test.rb
+++ b/actionmailer/test/old_base/mail_service_test.rb
@@ -674,7 +674,7 @@ The body
EOF
mail = Mail.new(msg)
assert_equal "testing testing \326\244", mail.subject
- assert_equal "Subject: testing\r\n\t=?UTF-8?Q?_testing_=D6=A4=?=\r\n", mail[:subject].encoded
+ assert_equal "Subject: testing =?UTF-8?Q?_testing_=D6=A4=?=\r\n", mail[:subject].encoded
end
def test_unquote_7bit_subject
@@ -863,7 +863,7 @@ EOF
def test_multipart_with_utf8_subject
mail = TestMailer.multipart_with_utf8_subject(@recipient)
- regex = Regexp.escape('Subject: =?UTF-8?Q?Foo_=C3=A1=C3=AB=C3=B4_=C3=AE=C3=BC=?=')
+ regex = Regexp.escape('Subject: =?UTF-8?Q?Foo_=C3=A1=C3=AB=C3=B4=?= =?UTF-8?Q?_=C3=AE=C3=BC=?=')
assert_match(/#{regex}/, mail.encoded)
string = "Foo áëô îü"
string.force_encoding('UTF-8') if string.respond_to?(:force_encoding)
@@ -872,7 +872,7 @@ EOF
def test_implicitly_multipart_with_utf8
mail = TestMailer.implicitly_multipart_with_utf8
- regex = Regexp.escape('Subject: =?UTF-8?Q?Foo_=C3=A1=C3=AB=C3=B4_=C3=AE=C3=BC=?=')
+ regex = Regexp.escape('Subject: =?UTF-8?Q?Foo_=C3=A1=C3=AB=C3=B4=?= =?UTF-8?Q?_=C3=AE=C3=BC=?=')
assert_match(/#{regex}/, mail.encoded)
string = "Foo áëô îü"
string.force_encoding('UTF-8') if string.respond_to?(:force_encoding)