From 2c471b3ac805b00ac1423f7ae2be1554aca0db9f Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 8 Dec 2011 15:11:23 -0800
Subject: load the encoding converter to work around [ruby-core:41556] when
 switching encodings

---
 actionpack/test/template/template_test.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack/test/template')

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
-- 
cgit v1.2.3