From fc15139824d8848d6e2a8a29073387841d0f1363 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 5 Nov 2012 18:31:21 -0700
Subject: mocha_standalone is now deprecated. Switch to mocha/api.

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

(limited to 'activesupport')

diff --git a/activesupport/lib/active_support/testing/mocha_module.rb b/activesupport/lib/active_support/testing/mocha_module.rb
index ed2942d23a..833dc867f0 100644
--- a/activesupport/lib/active_support/testing/mocha_module.rb
+++ b/activesupport/lib/active_support/testing/mocha_module.rb
@@ -2,7 +2,7 @@ module ActiveSupport
   module Testing
     module MochaModule
       begin
-        require 'mocha_standalone'
+        require 'mocha/api'
         include Mocha::API
 
         def before_setup
-- 
cgit v1.2.3