diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2012-01-05 08:52:29 -0800 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-01-05 08:52:29 -0800 |
commit | 3040940ab5576d8ceb17fa3cc83223815371be7c (patch) | |
tree | 8f24f3cb50f960ee6de95f017336ff5ee12ac9fa /activesupport/lib | |
parent | 377a879e12259f30566eb4a8007c924c27f04d8a (diff) | |
parent | 46761b88f06c41fbf04e65fae2cce8bdbdf76635 (diff) | |
download | rails-3040940ab5576d8ceb17fa3cc83223815371be7c.tar.gz rails-3040940ab5576d8ceb17fa3cc83223815371be7c.tar.bz2 rails-3040940ab5576d8ceb17fa3cc83223815371be7c.zip |
Merge pull request #4320 from castlerock/include_only_minitest
support only MiniTest run with Isolation test
Diffstat (limited to 'activesupport/lib')
-rw-r--r-- | activesupport/lib/active_support/testing/isolation.rb | 30 |
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 |