diff options
| author | Mike Gunderloy <MikeG1@larkfarm.com> | 2012-08-02 06:43:47 -0500 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-08-02 15:38:08 -0300 |
| commit | 5c42889e3b37a4f161dde548b204b47a06d7c97c (patch) | |
| tree | 82f6f16af5931ee8b78f8b5ad344bb23088dcb97 | |
| parent | 74cf196f63742f21213fd5f8a889e8ee29ab621f (diff) | |
| download | rails-5c42889e3b37a4f161dde548b204b47a06d7c97c.tar.gz rails-5c42889e3b37a4f161dde548b204b47a06d7c97c.tar.bz2 rails-5c42889e3b37a4f161dde548b204b47a06d7c97c.zip | |
Fix ActiveSupport integration with Mocha > 0.12.1
Mocha 0.12.2 renames the Integration module to
MonkeyPatching. This breaks the code Rails uses
to retrieve the assertion counter from Mocha.
| -rw-r--r-- | activesupport/lib/active_support/testing/setup_and_teardown.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/testing/setup_and_teardown.rb b/activesupport/lib/active_support/testing/setup_and_teardown.rb index 78d914f8cf..f2268d1767 100644 --- a/activesupport/lib/active_support/testing/setup_and_teardown.rb +++ b/activesupport/lib/active_support/testing/setup_and_teardown.rb @@ -104,8 +104,10 @@ module ActiveSupport if respond_to?(:mocha_verify) # using mocha if defined?(Mocha::TestCaseAdapter::AssertionCounter) Mocha::TestCaseAdapter::AssertionCounter.new(result) - else + elsif defined?(Mocha::Integration::TestUnit::AssertionCounter) Mocha::Integration::TestUnit::AssertionCounter.new(result) + else + Mocha::MonkeyPatching::TestUnit::AssertionCounter.new(result) end end end |