diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2010-08-22 18:43:31 -0300 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2010-08-22 18:43:31 -0300 |
commit | 8d1ee434da3348089daa497980d1e24837ee8be6 (patch) | |
tree | c6d8daa86c850cc81461738eb6ec6117506bcff3 /activesupport | |
parent | ae2c60734a0f71593709608710a0c7507bb8699e (diff) | |
download | rails-8d1ee434da3348089daa497980d1e24837ee8be6.tar.gz rails-8d1ee434da3348089daa497980d1e24837ee8be6.tar.bz2 rails-8d1ee434da3348089daa497980d1e24837ee8be6.zip |
Silence warnings for Encoding.default_external= and Encoding.default_internal=
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/test/abstract_unit.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb index 83b25de332..0382739871 100644 --- a/activesupport/test/abstract_unit.rb +++ b/activesupport/test/abstract_unit.rb @@ -10,16 +10,19 @@ end lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) +require 'active_support/core_ext/kernel/reporting' + require 'active_support/core_ext/string/encoding' if "ruby".encoding_aware? # These are the normal settings that will be set up by Railties # TODO: Have these tests support other combinations of these values - Encoding.default_internal = "UTF-8" - Encoding.default_external = "UTF-8" + silence_warnings do + Encoding.default_internal = "UTF-8" + Encoding.default_external = "UTF-8" + end end require 'test/unit' -require 'active_support/core_ext/kernel/reporting' require 'empty_bool' silence_warnings { require 'mocha' } |