diff options
| author | wycats <wycats@gmail.com> | 2010-03-26 15:10:24 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-03-26 15:10:24 -0700 |
| commit | 197904341f2b2f21d69c653cede3aec124e86720 (patch) | |
| tree | 83f1234e238016126860a929594db22e1862d783 /actionmailer/test/abstract_unit.rb | |
| parent | 76d2c455c0607b4cd5f238cadef8f933a18567fb (diff) | |
| parent | b3a0aed028835ce4551c4a76742744a40a71b0be (diff) | |
| download | rails-197904341f2b2f21d69c653cede3aec124e86720.tar.gz rails-197904341f2b2f21d69c653cede3aec124e86720.tar.bz2 rails-197904341f2b2f21d69c653cede3aec124e86720.zip | |
Merge branch 'master' into docrails
Diffstat (limited to 'actionmailer/test/abstract_unit.rb')
| -rw-r--r-- | actionmailer/test/abstract_unit.rb | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index 16fef3a9a4..ea15709b45 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -1,4 +1,23 @@ -require File.expand_path('../../../load_paths', __FILE__) +# Pathname has a warning, so require it first while silencing +# warnings to shut it up. +# +# Also, in 1.9, Bundler creates warnings due to overriding +# Rubygems methods +begin + old, $VERBOSE = $VERBOSE, nil + require 'pathname' + require File.expand_path('../../../load_paths', __FILE__) +ensure + $VERBOSE = old +end + + +require 'active_support/core_ext/kernel/reporting' +silence_warnings do + # These external dependencies have warnings :/ + require 'text/format' + require 'mail' +end lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) |