From dd44626c7f2015c61d83a1be1265e664e87419f6 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Tue, 26 Apr 2011 20:04:48 +1000 Subject: Updating to use Mail v2.3.0 Need to move the require of mail in test/abstract_unit to be after active support to make sure we use ActiveSupport multibyte handlers, otherwise, Mail will load its internal multibyte compat --- actionmailer/test/abstract_unit.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'actionmailer/test') diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index ce664bf301..0b076e1ff9 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -23,11 +23,6 @@ if "ruby".encoding_aware? end end -silence_warnings do - # These external dependencies have warnings :/ - require 'mail' -end - lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) @@ -35,6 +30,11 @@ require 'test/unit' require 'action_mailer' require 'action_mailer/test_case' +silence_warnings do + # These external dependencies have warnings :/ + require 'mail' +end + # Show backtraces for deprecated behavior for quicker cleanup. ActiveSupport::Deprecation.debug = true -- cgit v1.2.3