diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-11-05 18:31:21 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-11-05 18:31:21 -0700 |
| commit | fc15139824d8848d6e2a8a29073387841d0f1363 (patch) | |
| tree | c0243bd71a63fadf757c63b2ba754d00ebfef024 | |
| parent | ae6d2efd844cc6cf6822fe424d8e09c510153c90 (diff) | |
| download | rails-fc15139824d8848d6e2a8a29073387841d0f1363.tar.gz rails-fc15139824d8848d6e2a8a29073387841d0f1363.tar.bz2 rails-fc15139824d8848d6e2a8a29073387841d0f1363.zip | |
mocha_standalone is now deprecated. Switch to mocha/api.
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/testing/mocha_module.rb | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -4,7 +4,7 @@ gemspec gem 'arel', github: 'rails/arel', branch: 'master' -gem 'mocha', '>= 0.11.2', require: false +gem 'mocha', github: 'floehopper/mocha', require: false gem 'rack-test', github: 'brynary/rack-test' gem 'rack-cache', '~> 1.2' gem 'bcrypt-ruby', '~> 3.0.0' 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 |