From 8d1ee434da3348089daa497980d1e24837ee8be6 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Sun, 22 Aug 2010 18:43:31 -0300 Subject: Silence warnings for Encoding.default_external= and Encoding.default_internal= --- activesupport/test/abstract_unit.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'activesupport/test') 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' } -- cgit v1.2.3