提交 bc9b1075 编写于 作者: J Jamis Buck

Revert "make TestCaseTest work for pre-1.9 rubies, too"

This reverts commit 79380395.
上级 1de1dc02
......@@ -2,8 +2,6 @@
module ActiveSupport
class TestCaseTest < ActiveSupport::TestCase
IS_MINITEST = defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
class FakeRunner
attr_reader :puked
......@@ -14,23 +12,9 @@ def initialize
def puke(klass, name, e)
@puked << [klass, name, e]
end
unless IS_MINITEST
def add_error(e)
puke(nil, nil, e)
end
def add_run
end
def add_assertion
end
def add_failure(msg, locations=nil)
end
end
end
if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
def test_callback_with_exception
tc = Class.new(TestCase) do
setup :bad_callback
......@@ -42,15 +26,12 @@ def test_true; assert true end
fr = FakeRunner.new
test = tc.new test_name
test.run(fr) {}
test.run fr
klass, name, exception = *fr.puked.first
if IS_MINITEST
assert_equal tc, klass
assert_equal test_name, name
end
assert_match %r{oh noes}, exception.message
assert_equal 'oh noes', exception.message
end
def test_teardown_callback_with_exception
......@@ -64,15 +45,13 @@ def test_true; assert true end
fr = FakeRunner.new
test = tc.new test_name
test.run(fr) {}
test.run fr
klass, name, exception = *fr.puked.first
if IS_MINITEST
assert_equal tc, klass
assert_equal test_name, name
assert_equal 'oh noes', exception.message
end
assert_match %r{oh noes}, exception.message
end
end
end
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册