Browse files

Cleaning up expectations from the new way mail does it

  • Loading branch information...
1 parent fd9ee49 commit bd89c391e81c82f72508118a1f6d19274463c182 @mikel mikel committed Apr 10, 2010
Showing with 3 additions and 3 deletions.
  1. +3 −3 actionmailer/test/old_base/mail_service_test.rb
View
6 actionmailer/test/old_base/mail_service_test.rb
@@ -674,7 +674,7 @@ def test_unquote_quoted_printable_subject
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 @@ def test_multipart_with_mime_version
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 @@ def test_multipart_with_utf8_subject
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)

0 comments on commit bd89c39

Please sign in to comment.