lib/spy/integration.rb in spy-0.4.1 vs lib/spy/integration.rb in spy-0.4.2

@@ -8,12 +8,14 @@
         super
         Spy.teardown
       end
     end
 
-    if defined?(::MiniTest::Unit::TestCase)
+    if defined?(::MiniTest::Unit::TestCase) && !::MiniTest::Unit::TestCase.include?(MiniTestAdapter)
       ::MiniTest::Unit::TestCase.send(:include, MiniTestAdapter)
-    else
+    end
+
+    if defined?(::Minitest::Test) && !::Minitest::Test.include?(MiniTestAdapter)
      ::Minitest::Test.send(:include, MiniTestAdapter)
     end
   end
 
   if defined?(::Test::Unit::TestCase) && !(defined?(::MiniTest::Unit::TestCase) && (::Test::Unit::TestCase < ::MiniTest::Unit::TestCase)) && !(defined?(::MiniTest::Spec) && (::Test::Unit::TestCase < ::MiniTest::Spec))