diff options
| author | José Valim <jose.valim@gmail.com> | 2010-09-29 10:04:42 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-09-29 10:04:42 +0200 |
| commit | 0bbf9029e8089356aed0e3be2f859d56951a89cf (patch) | |
| tree | 38e41ef8b63140a91c828bec03e06e83f38899b6 /actionpack/test/template/render_test.rb | |
| parent | 006cef7107b648882cfc09f56904c601454cfc77 (diff) | |
| parent | 17599abc9c06f30ff23d7ad47a3f029e32c26c88 (diff) | |
| download | rails-0bbf9029e8089356aed0e3be2f859d56951a89cf.tar.gz rails-0bbf9029e8089356aed0e3be2f859d56951a89cf.tar.bz2 rails-0bbf9029e8089356aed0e3be2f859d56951a89cf.zip | |
Merge remote branch 'miloops/warnings'
Diffstat (limited to 'actionpack/test/template/render_test.rb')
| -rw-r--r-- | actionpack/test/template/render_test.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb index c17bec891b..205fdcf345 100644 --- a/actionpack/test/template/render_test.rb +++ b/actionpack/test/template/render_test.rb @@ -319,10 +319,11 @@ class LazyViewRenderTest < ActiveSupport::TestCase end def with_external_encoding(encoding) - old, Encoding.default_external = Encoding.default_external, encoding + old = Encoding.default_external + silence_warnings { Encoding.default_external = encoding } yield ensure - Encoding.default_external = old + silence_warnings { Encoding.default_external = old } end end end |