Permalink
Browse files

No need to work around 1.8 warnings anymore.

  • Loading branch information...
1 parent 5c0cbb3 commit 3d02195174a41b96f3f55219256677b8da06d0cb @mhfs mhfs committed May 3, 2012
Showing with 1 addition and 13 deletions.
  1. +1 −13 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

3 comments on commit 3d02195

Contributor

joevandyk commented on 3d02195 May 4, 2012

just curious, why aren't we using require_relative?

Owner

jeremy replied May 4, 2012

@joevandyk no reason not to!

Contributor

joevandyk replied May 4, 2012

@jeremy sweet, i'll put together a pull request to remove all the require File.expand_path calls.

Please sign in to comment.