From 86dd2f841d29b326cc480e9c58de63f54799d2c1 Mon Sep 17 00:00:00 2001
From: Matthias Hennemeyer <mhennemeyer@gmail.com>
Date: Wed, 4 Feb 2009 10:52:55 +0100
Subject: [PATCH] Tightening the condition for including
 ActiveSupport::Testing::SetupAndTeardown::ForMiniTest.

[#1871 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 activesupport/lib/active_support/testing/setup_and_teardown.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/testing/setup_and_teardown.rb b/activesupport/lib/active_support/testing/setup_and_teardown.rb
index 245f57a7b0f54..7edf6fdb3265b 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 @@ 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