vendor/rails/activesupport/lib/active_support/test_case.rb in radiant-0.7.2 vs vendor/rails/activesupport/lib/active_support/test_case.rb in radiant-0.8.0

@@ -1,13 +1,39 @@
+begin
+  gem 'mocha', '>= 0.9.3'
+  require 'mocha'
+rescue LoadError
+  # Fake Mocha::ExpectationError so we can rescue it in #run. Bleh.
+  Object.const_set :Mocha, Module.new
+  Mocha.const_set :ExpectationError, Class.new(StandardError)
+end
+
 require 'test/unit/testcase'
 require 'active_support/testing/setup_and_teardown'
-require 'active_support/testing/default'
+require 'active_support/testing/assertions'
+require 'active_support/testing/deprecation'
+require 'active_support/testing/declarative'
 
-# TODO: move to core_ext
-class Test::Unit::TestCase #:nodoc:
-  include ActiveSupport::Testing::SetupAndTeardown
-end
-
 module ActiveSupport
-  class TestCase < Test::Unit::TestCase
+  class TestCase < ::Test::Unit::TestCase
+    if defined? MiniTest
+      Assertion = MiniTest::Assertion
+      alias_method :method_name, :name
+    else
+      # TODO: Figure out how to get the Rails::BacktraceFilter into minitest/unit
+      if defined?(Rails) && ENV['BACKTRACE'].nil?
+        require 'rails/backtrace_cleaner'
+        Test::Unit::Util::BacktraceFilter.module_eval { include Rails::BacktraceFilterForTestUnit }
+      end
+
+      Assertion = Test::Unit::AssertionFailedError
+
+      require 'active_support/testing/default'
+      include ActiveSupport::Testing::Default
+    end
+
+    include ActiveSupport::Testing::SetupAndTeardown
+    include ActiveSupport::Testing::Assertions
+    include ActiveSupport::Testing::Deprecation
+    extend ActiveSupport::Testing::Declarative
   end
 end