Permalink
Browse files

Merge pull request #3928 from arunagw/fix_template_test

Fix template test
  • Loading branch information...
2 parents d06c3b3 + 49bbdf2 commit 25ac7e4607b231d72b3667c438cdd7c7c65f96bd @josevalim josevalim committed Dec 10, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 actionpack/test/template/template_test.rb
@@ -170,7 +170,7 @@ def test_error_when_template_isnt_valid_utf8
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

0 comments on commit 25ac7e4

Please sign in to comment.