diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-04-28 13:41:21 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-04-28 13:41:21 -0700 |
| commit | b9ab4c780af82c1c60d63c50f040a55da5bfa8db (patch) | |
| tree | 4df8981047957fce17c10ea5c6aac7955aef2a4d /actionmailer/test | |
| parent | 8f1a5bfee1305f193bb659c010ca7e2272c12051 (diff) | |
| parent | 22184930ea323872c73542767d447bbbd7878c96 (diff) | |
| download | rails-b9ab4c780af82c1c60d63c50f040a55da5bfa8db.tar.gz rails-b9ab4c780af82c1c60d63c50f040a55da5bfa8db.tar.bz2 rails-b9ab4c780af82c1c60d63c50f040a55da5bfa8db.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionmailer/test')
| -rw-r--r-- | actionmailer/test/old_base/mail_service_test.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/actionmailer/test/old_base/mail_service_test.rb b/actionmailer/test/old_base/mail_service_test.rb index db2db59cc7..9da9132fe1 100644 --- a/actionmailer/test/old_base/mail_service_test.rb +++ b/actionmailer/test/old_base/mail_service_test.rb @@ -866,7 +866,6 @@ EOF regex = Regexp.escape('Subject: Foo =?UTF-8?Q?=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) assert_match(string, mail.subject) end @@ -875,7 +874,6 @@ EOF regex = Regexp.escape('Subject: Foo =?UTF-8?Q?=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) assert_match(string, mail.subject) end |