Skip to content
Browse files

The latest trunk of Mocha > 0.9.5 which addresses issue with MiniUnit…

… compatibility uses namespaced integration classes.

[#2060 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  • Loading branch information...
1 parent 0a887e2 commit 4b4e7caffa361a1a3317586d8f498b4ba353adba @metaskills metaskills committed with jeremy
Showing with 6 additions and 1 deletion.
  1. +6 −1 activesupport/lib/active_support/testing/setup_and_teardown.rb
View
7 activesupport/lib/active_support/testing/setup_and_teardown.rb
@@ -45,7 +45,12 @@ def run(result)
return if @method_name.to_s == "default_test"
if using_mocha = respond_to?(:mocha_verify)
- assertion_counter = Mocha::TestCaseAdapter::AssertionCounter.new(result)
+ assertion_counter_klass = if defined?(Mocha::TestCaseAdapter::AssertionCounter)
+ Mocha::TestCaseAdapter::AssertionCounter
+ else
+ Mocha::Integration::TestUnit::AssertionCounter
+ end
+ assertion_counter = assertion_counter_klass.new(result)
end
yield(Test::Unit::TestCase::STARTED, name)

0 comments on commit 4b4e7ca

Please sign in to comment.
Something went wrong with that request. Please try again.