Silence warnings for Encoding.default_external= and Encoding.default_internal=

3 files changed, 18 insertions, 8 deletions

diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index d91c81886d..b430dffdf8 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -11,15 +11,18 @@ ensure
   $VERBOSE = old
 end
 
+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 'active_support/core_ext/kernel/reporting'
 silence_warnings do
   # These external dependencies have warnings :/
   require 'text/format'
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 23b6330805..869842fc9c 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -12,12 +12,16 @@ $:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers')
 
 ENV['TMPDIR'] = File.join(File.dirname(__FILE__), 'tmp')
 
+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'
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' }