diff options
| author | Matthias Hennemeyer <mhennemeyer@gmail.com> | 2009-02-04 10:52:55 +0100 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-02-06 08:59:02 -0800 |
| commit | 86dd2f841d29b326cc480e9c58de63f54799d2c1 (patch) | |
| tree | 62f438d8981a61fcb33222a485b0b956c3522d68 /activesupport/lib | |
| parent | a4790e93bce7fdb4ff049209d7fa49c6c30650f0 (diff) | |
| download | rails-86dd2f841d29b326cc480e9c58de63f54799d2c1.tar.gz rails-86dd2f841d29b326cc480e9c58de63f54799d2c1.tar.bz2 rails-86dd2f841d29b326cc480e9c58de63f54799d2c1.zip | |
Tightening the condition for including ActiveSupport::Testing::SetupAndTeardown::ForMiniTest.
[#1871 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/testing/setup_and_teardown.rb | 2 |
1 files changed, 1 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 245f57a7b0..7edf6fdb32 100644 --- a/activesupport/lib/active_support/testing/setup_and_teardown.rb +++ b/activesupport/lib/active_support/testing/setup_and_teardown.rb @@ -8,7 +8,7 @@ module ActiveSupport include ActiveSupport::Callbacks define_callbacks :setup, :teardown - if defined? MiniTest + if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions include ForMiniTest else include ForClassicTestUnit |