From 2d43d3b7b3fb30c6d9ebbb50f8ae0cc43ce72ac7 Mon Sep 17 00:00:00 2001 From: Matthias Hennemeyer Date: Wed, 4 Feb 2009 10:52:55 +0100 Subject: [PATCH] Tightening the condition for including ActiveSupport::Testing::SetupAndTeardown::ForMiniTest. --- .../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 245f57a..41e73cb 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 -- 1.6.0.2