aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/abstract_unit.rb
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-03-17 00:53:48 -0700
committerwycats <wycats@gmail.com>2010-03-17 00:53:48 -0700
commit640ee5b68d1078fc164bd4e10c019f284ad9b760 (patch)
treec0216c11cc577d93393939c343785189a71cd0c1 /activesupport/test/abstract_unit.rb
parenta5587efc1903fd27d4b179753aa6e139445ad18c (diff)
downloadrails-640ee5b68d1078fc164bd4e10c019f284ad9b760.tar.gz
rails-640ee5b68d1078fc164bd4e10c019f284ad9b760.tar.bz2
rails-640ee5b68d1078fc164bd4e10c019f284ad9b760.zip
Fix some more warnings on 1.9
Diffstat (limited to 'activesupport/test/abstract_unit.rb')
-rw-r--r--activesupport/test/abstract_unit.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb
index da338a2a26..67f652325e 100644
--- a/activesupport/test/abstract_unit.rb
+++ b/activesupport/test/abstract_unit.rb
@@ -1,10 +1,17 @@
-require File.expand_path('../../../load_paths', __FILE__)
+begin
+ old, $VERBOSE = $VERBOSE, nil
+ require File.expand_path('../../../load_paths', __FILE__)
+ensure
+ $VERBOSE = old
+end
lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
require 'test/unit'
-require 'mocha'
+require 'active_support/core_ext/kernel/reporting'
+
+silence_warnings { require 'mocha' }
ENV['NO_RELOAD'] = '1'
require 'active_support'