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/actionmailer.gemspec | 2 +- actionmailer/test/abstract_unit.rb | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec index a59069cc37..447e25ca8a 100644 --- a/actionmailer/actionmailer.gemspec +++ b/actionmailer/actionmailer.gemspec @@ -18,5 +18,5 @@ Gem::Specification.new do |s| s.requirements << 'none' s.add_dependency('actionpack', version) - s.add_dependency('mail', '~> 2.2.16') + s.add_dependency('mail', '~> 2.3.0') end 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