aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-12-08 15:11:23 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2011-12-08 15:14:07 -0800
commit2c471b3ac805b00ac1423f7ae2be1554aca0db9f (patch)
treeb196fa74246965b518cdfc3296c9d77352b712f3 /actionpack/test/template
parent8c26cd5d97be771c4c7e1cc8b1eaaf60d4dde692 (diff)
downloadrails-2c471b3ac805b00ac1423f7ae2be1554aca0db9f.tar.gz
rails-2c471b3ac805b00ac1423f7ae2be1554aca0db9f.tar.bz2
rails-2c471b3ac805b00ac1423f7ae2be1554aca0db9f.zip
load the encoding converter to work around [ruby-core:41556] when switching encodings
Diffstat (limited to 'actionpack/test/template')
-rw-r--r--actionpack/test/template/template_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index 70ca876c67..fe82504d3b 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -170,6 +170,7 @@ class TestERBTemplate < ActiveSupport::TestCase
def with_external_encoding(encoding)
old = Encoding.default_external
+ Encoding::Converter.new old, encoding
silence_warnings { Encoding.default_external = encoding }
yield
ensure