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= --- actionmailer/test/abstract_unit.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'actionmailer/test') 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' -- cgit v1.2.3