diff options
| author | José Valim <jose.valim@gmail.com> | 2012-05-03 05:26:39 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-05-03 05:26:39 -0700 |
| commit | 54174b5f4d24115bf1d005f7073041654da27f5f (patch) | |
| tree | c398ef2bc6f26cda0a116a2128286d32068f9dd1 /actionmailer/test | |
| parent | ab7b5501c66336a5c67946cc18db7cc2b377d071 (diff) | |
| parent | 5f2f9b57c404f27f9519d1e5dfb972981181da66 (diff) | |
| download | rails-54174b5f4d24115bf1d005f7073041654da27f5f.tar.gz rails-54174b5f4d24115bf1d005f7073041654da27f5f.tar.bz2 rails-54174b5f4d24115bf1d005f7073041654da27f5f.zip | |
Merge pull request #6141 from mhfs/mailer_tweeks
Minor ActionMailer tweaks
Diffstat (limited to 'actionmailer/test')
| -rw-r--r-- | actionmailer/test/abstract_unit.rb | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index 3a519253f9..487102b564 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -1,16 +1,4 @@ -# 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 File.expand_path('../../../load_paths', __FILE__) require 'active_support/core_ext/kernel/reporting' # These are the normal settings that will be set up by Railties |