From 3d02195174a41b96f3f55219256677b8da06d0cb Mon Sep 17 00:00:00 2001
From: Marcelo Silveira <marcelo@mhfs.com.br>
Date: Thu, 3 May 2012 09:10:33 -0300
Subject: No need to work around 1.8 warnings anymore.

---
 actionmailer/test/abstract_unit.rb | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'actionmailer/test')

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
-- 
cgit v1.2.3