aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/test/template/template_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index fe82504d3b..13d30a93ce 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -170,7 +170,7 @@ class TestERBTemplate < ActiveSupport::TestCase
def with_external_encoding(encoding)
old = Encoding.default_external
- Encoding::Converter.new old, encoding
+ Encoding::Converter.new old, encoding if old != encoding
silence_warnings { Encoding.default_external = encoding }
yield
ensure