aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-11-05 18:31:21 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-11-05 18:31:21 -0700
commitfc15139824d8848d6e2a8a29073387841d0f1363 (patch)
treec0243bd71a63fadf757c63b2ba754d00ebfef024 /activesupport
parentae6d2efd844cc6cf6822fe424d8e09c510153c90 (diff)
downloadrails-fc15139824d8848d6e2a8a29073387841d0f1363.tar.gz
rails-fc15139824d8848d6e2a8a29073387841d0f1363.tar.bz2
rails-fc15139824d8848d6e2a8a29073387841d0f1363.zip
mocha_standalone is now deprecated. Switch to mocha/api.
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/testing/mocha_module.rb2
1 files changed, 1 insertions, 1 deletions
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