diff options
| author | Sergey Nartimov <just.lest@gmail.com> | 2011-12-24 15:57:54 +0300 |
|---|---|---|
| committer | Sergey Nartimov <just.lest@gmail.com> | 2011-12-24 15:57:54 +0300 |
| commit | 5ca86ac8f924b333a5a01a47cc07cbcf39c16e80 (patch) | |
| tree | da7a9a4d9cd8ad05648bde5d283715d5feea4d81 /actionmailer/test/abstract_unit.rb | |
| parent | a5fa310f406e299a1ac54d1a227bde93b7ce282b (diff) | |
| download | rails-5ca86ac8f924b333a5a01a47cc07cbcf39c16e80.tar.gz rails-5ca86ac8f924b333a5a01a47cc07cbcf39c16e80.tar.bz2 rails-5ca86ac8f924b333a5a01a47cc07cbcf39c16e80.zip | |
deprecate String#encoding_aware? and remove its usage
Diffstat (limited to 'actionmailer/test/abstract_unit.rb')
| -rw-r--r-- | actionmailer/test/abstract_unit.rb | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index 0b076e1ff9..d86e0dc4c0 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -13,14 +13,11 @@ 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 - silence_warnings do - Encoding.default_internal = "UTF-8" - Encoding.default_external = "UTF-8" - end +# These are the normal settings that will be set up by Railties +# TODO: Have these tests support other combinations of these values +silence_warnings do + Encoding.default_internal = "UTF-8" + Encoding.default_external = "UTF-8" end lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") |