Permalink
Browse files

Tightening the condition for including ActiveSupport::Testing::SetupA…

…ndTeardown::ForMiniTest.

[#1871 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  • Loading branch information...
1 parent a4790e9 commit 86dd2f841d29b326cc480e9c58de63f54799d2c1 @mhennemeyer mhennemeyer committed with jeremy Feb 4, 2009
Showing with 1 addition and 1 deletion.
  1. +1 −1 activesupport/lib/active_support/testing/setup_and_teardown.rb
View
2 activesupport/lib/active_support/testing/setup_and_teardown.rb
@@ -8,7 +8,7 @@ def self.included(base)
include ActiveSupport::Callbacks
define_callbacks :setup, :teardown
- if defined? MiniTest
+ if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
include ForMiniTest
else
include ForClassicTestUnit

0 comments on commit 86dd2f8

Please sign in to comment.