aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorVishnu Atrai <vishnu.atrai@gmail.com>2012-01-05 21:19:24 +0530
committerVishnu Atrai <vishnu.atrai@gmail.com>2012-01-05 21:19:24 +0530
commit46761b88f06c41fbf04e65fae2cce8bdbdf76635 (patch)
treea215870f1c2d65c397b5b7a210776b859996770f /activesupport
parent44951c8d44bebbb94f7a19b043b3eddcbd8b4657 (diff)
downloadrails-46761b88f06c41fbf04e65fae2cce8bdbdf76635.tar.gz
rails-46761b88f06c41fbf04e65fae2cce8bdbdf76635.tar.bz2
rails-46761b88f06c41fbf04e65fae2cce8bdbdf76635.zip
support only MiniTest run with Isolation test
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/testing/isolation.rb30
1 files changed, 1 insertions, 29 deletions
diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb
index 6b29ba4c10..c896b955fb 100644
--- a/activesupport/lib/active_support/testing/isolation.rb
+++ b/activesupport/lib/active_support/testing/isolation.rb
@@ -38,11 +38,7 @@ module ActiveSupport
end
def self.included(base)
- if defined?(::MiniTest) && base < ::MiniTest::Unit::TestCase
- base.send :include, MiniTest
- elsif defined?(Test::Unit)
- base.send :include, TestUnit
- end
+ base.send :include, MiniTest
end
def _run_class_setup # class setup method should only happen in parent
@@ -52,30 +48,6 @@ module ActiveSupport
end
end
- module TestUnit
- def run(result)
- _run_class_setup
-
- yield(Test::Unit::TestCase::STARTED, name)
-
- @_result = result
-
- serialized = run_in_isolation do |proxy|
- begin
- super(proxy) { }
- rescue Exception => e
- proxy.add_error(Test::Unit::Error.new(name, e))
- end
- end
-
- retval, proxy = Marshal.load(serialized)
- proxy.__replay__(@_result)
-
- yield(Test::Unit::TestCase::FINISHED, name)
- retval
- end
- end
-
module MiniTest
def run(runner)
_run_class_setup