diff options
| author | James Mead <james@floehopper.org> | 2012-11-03 17:53:35 +0000 |
|---|---|---|
| committer | James Mead <james@floehopper.org> | 2012-11-13 08:25:14 +0000 |
| commit | 3791cac8747b5e36fe9619301a55d69f8feff982 (patch) | |
| tree | 242718714720b5201abec9a653b84ca742dbfc34 | |
| parent | 5573c1d29565f17aca48b6a320a676bf9f962f20 (diff) | |
| download | rails-3791cac8747b5e36fe9619301a55d69f8feff982.tar.gz rails-3791cac8747b5e36fe9619301a55d69f8feff982.tar.bz2 rails-3791cac8747b5e36fe9619301a55d69f8feff982.zip | |
Avoid a Mocha deprecation warning.
| -rw-r--r-- | activesupport/lib/active_support/testing/mochaing.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |