Skip to content
Browse files

Ruby 1.9 compat: test encoding fixes. Closes #10597 [murphy]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8666 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 52876c6 commit abfab89fd824a4fab9d1415efaec87ee2f48aa50 @jeremy jeremy committed
Showing with 5 additions and 1 deletion.
  1. +5 −1 actionmailer/test/quoting_test.rb
View
6 actionmailer/test/quoting_test.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
require 'abstract_unit'
require 'tmail'
require 'tempfile'
@@ -38,11 +39,14 @@ def test_unqoute_in_the_middle
def test_unqoute_iso
a ="=?ISO-8859-1?Q?Brosch=FCre_Rand?="
b = TMail::Unquoter.unquote_and_convert_to(a, 'iso-8859-1')
- assert_equal "Brosch\374re Rand", b
+ expected = "Brosch\374re Rand"
+ expected.force_encoding 'iso-8859-1' if expected.respond_to?(:force_encoding)
+ assert_equal expected, b
end
def test_quote_multibyte_chars
original = "\303\246 \303\270 and \303\245"
+ original.force_encoding nil if original.respond_to?(:force_encoding)
result = execute_in_sandbox(<<-CODE)
$:.unshift(File.dirname(__FILE__) + "/../lib/")

0 comments on commit abfab89

Please sign in to comment.
Something went wrong with that request. Please try again.