From 3791cac8747b5e36fe9619301a55d69f8feff982 Mon Sep 17 00:00:00 2001
From: James Mead <james@floehopper.org>
Date: Sat, 3 Nov 2012 17:53:35 +0000
Subject: Avoid a Mocha deprecation warning.

---
 activesupport/lib/active_support/testing/mochaing.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support/testing')

diff --git a/activesupport/lib/active_support/testing/mochaing.rb b/activesupport/lib/active_support/testing/mochaing.rb
index 4ad75a6681..0161476d79 100644
--- a/activesupport/lib/active_support/testing/mochaing.rb
+++ b/activesupport/lib/active_support/testing/mochaing.rb
@@ -1,5 +1,5 @@
 begin
-  silence_warnings { require 'mocha' }
+  silence_warnings { require 'mocha/setup' }
 rescue LoadError
   # Fake Mocha::ExpectationError so we can rescue it in #run. Bleh.
   Object.const_set :Mocha, Module.new
-- 
cgit v1.2.3