aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorMikel Lindsaar <raasdnil@gmail.com>2010-04-08 20:40:43 +1000
committerMikel Lindsaar <raasdnil@gmail.com>2010-04-11 18:04:55 +1000
commit6c6bef245a7b636cbd6a0162cc5061d8c040aadb (patch)
tree3ef0752f74c158152ad9b962fa6684f0877e8eaf /actionmailer
parentdbcf01e6310bf3dc72499beb8f4161fb82143388 (diff)
downloadrails-6c6bef245a7b636cbd6a0162cc5061d8c040aadb.tar.gz
rails-6c6bef245a7b636cbd6a0162cc5061d8c040aadb.tar.bz2
rails-6c6bef245a7b636cbd6a0162cc5061d8c040aadb.zip
Fixing up some bad test cases
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 b584245cb2..9cf01854c5 100644
--- a/actionmailer/test/old_base/mail_service_test.rb
+++ b/actionmailer/test/old_base/mail_service_test.rb
@@ -567,7 +567,6 @@ class ActionMailerTest < Test::Unit::TestCase
def test_iso_charset
TestMailer.delivery_method = :test
-
expected = new_mail( "iso-8859-1" )
expected.to = @recipient
expected.subject = encode "testing isø charsets", "iso-8859-1"
@@ -868,15 +867,16 @@ EOF
assert_match(/#{regex}/, mail.encoded)
string = "Foo áëô îü"
string.force_encoding('UTF-8') if string.respond_to?(:force_encoding)
- assert_match(string, mail.subject.decoded)
+ assert_match(string, mail.subject)
end
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=?=')
assert_match(/#{regex}/, mail.encoded)
+ string = "Foo áëô îü"
string.force_encoding('UTF-8') if string.respond_to?(:force_encoding)
- assert_match(string, mail.subject.decoded)
+ assert_match(string, mail.subject)
end
def test_explicitly_multipart_messages