diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-23 15:29:35 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-23 15:29:35 -0800 |
| commit | 671538cd6ea0bd4c463e7bf7d238a55924a8af53 (patch) | |
| tree | 661710f2df243f02452846c3e85f2980acbf813a /actionmailer/test/quoting_test.rb | |
| parent | ca5de16ddc50b4f8d8a88e91571f5c5a2c8c751c (diff) | |
| parent | 3a72923e27195983d37bdb39ef26b29cf03d3483 (diff) | |
| download | rails-671538cd6ea0bd4c463e7bf7d238a55924a8af53.tar.gz rails-671538cd6ea0bd4c463e7bf7d238a55924a8af53.tar.bz2 rails-671538cd6ea0bd4c463e7bf7d238a55924a8af53.zip | |
Merge commit 'mikel/master' into mail
Conflicts:
actionmailer/lib/action_mailer.rb
Diffstat (limited to 'actionmailer/test/quoting_test.rb')
| -rw-r--r-- | actionmailer/test/quoting_test.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/actionmailer/test/quoting_test.rb b/actionmailer/test/quoting_test.rb index 4e86d55285..32f34f6028 100644 --- a/actionmailer/test/quoting_test.rb +++ b/actionmailer/test/quoting_test.rb @@ -57,6 +57,10 @@ class QuotingTest < Test::Unit::TestCase CODE unquoted = Mail::Encodings.unquote_and_convert_to(result, nil) + + unquoted.force_encoding(Encoding::ASCII_8BIT) if unquoted.respond_to?(:force_encoding) + original.force_encoding(Encoding::ASCII_8BIT) if original.respond_to?(:force_encoding) + assert_equal unquoted, original end |