diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-13 02:34:42 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-13 02:34:42 -0800 |
| commit | 0ed585adeb10d11badc892702d01e3c7addccbf4 (patch) | |
| tree | d862bbf79ed1a16312763a4b3eb641c53e78b15b /activesupport/lib/active_support/testing/mochaing.rb | |
| parent | 3e53fe635c6e7b82609219422458574e2f74b551 (diff) | |
| parent | 3791cac8747b5e36fe9619301a55d69f8feff982 (diff) | |
| download | rails-0ed585adeb10d11badc892702d01e3c7addccbf4.tar.gz rails-0ed585adeb10d11badc892702d01e3c7addccbf4.tar.bz2 rails-0ed585adeb10d11badc892702d01e3c7addccbf4.zip | |
Merge pull request #8200 from freerange/3-2-stable-with-mocha-fixes
Fix 3-2-stable to work with Mocha v0.13.0
Diffstat (limited to 'activesupport/lib/active_support/testing/mochaing.rb')
| -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 |