Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

This reverts commit 8378a44.
  • Loading branch information...
commit 3afa5385c929acb9f7cb9801da32e06cb4af101b 1 parent c545331
@jamis jamis authored
Showing with 25 additions and 46 deletions.
  1. +25 −46 activesupport/test/test_case_test.rb
View
71 activesupport/test/test_case_test.rb
@@ -2,8 +2,6 @@
module ActiveSupport
class TestCaseTest < ActiveSupport::TestCase
- IS_MINITEST = defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
-
class FakeRunner
attr_reader :puked
@@ -14,65 +12,46 @@ 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
- def test_callback_with_exception
- tc = Class.new(TestCase) do
- setup :bad_callback
- def bad_callback; raise 'oh noes' end
- def test_true; assert true end
- end
+ if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
+ def test_callback_with_exception
+ tc = Class.new(TestCase) do
+ setup :bad_callback
+ def bad_callback; raise 'oh noes' end
+ def test_true; assert true end
+ end
- test_name = 'test_true'
- fr = FakeRunner.new
+ test_name = 'test_true'
+ fr = FakeRunner.new
- test = tc.new test_name
- test.run(fr) {}
- klass, name, exception = *fr.puked.first
+ test = tc.new test_name
+ 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
-
- def test_teardown_callback_with_exception
- tc = Class.new(TestCase) do
- teardown :bad_callback
- def bad_callback; raise 'oh noes' end
- def test_true; assert true end
- end
+ def test_teardown_callback_with_exception
+ tc = Class.new(TestCase) do
+ teardown :bad_callback
+ def bad_callback; raise 'oh noes' end
+ def test_true; assert true end
+ end
- test_name = 'test_true'
- fr = FakeRunner.new
+ test_name = 'test_true'
+ fr = FakeRunner.new
- test = tc.new test_name
- test.run(fr) {}
- klass, name, exception = *fr.puked.first
+ test = tc.new test_name
+ 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

0 comments on commit 3afa538

Please sign in to comment.
Something went wrong with that request. Please try again.