Skip to content
Browse files

[#5406 state:resolved] calling the correct method on minitest to obta…

…in the test name
  • Loading branch information...
1 parent fb526a0 commit a448e746615cd3f29bf47c0e4a3b4abf2f0a844a @tenderlove tenderlove committed Oct 4, 2010
View
2 activesupport/lib/active_support/testing/setup_and_teardown.rb
@@ -23,7 +23,7 @@ def run(runner)
run_callbacks :setup
result = super
rescue Exception => e
- result = runner.puke(self.class, self.name, e)
+ result = runner.puke(self.class, self.__name__, e)
ensure
begin
run_callbacks :teardown, :enumerator => :reverse_each
View
38 activesupport/test/test_case_test.rb
@@ -0,0 +1,38 @@
+require 'abstract_unit'
+
+module ActiveSupport
+ class TestCaseTest < ActiveSupport::TestCase
+ class FakeRunner
+ attr_reader :puked
+
+ def initialize
+ @puked = []
+ end
+
+ def puke(klass, name, e)
+ @puked << [klass, name, e]
+ 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 = tc.new test_name
+ test.run fr
+ klass, name, exception = *fr.puked.first
+
+ assert_equal tc, klass
+ assert_equal test_name, name
+ assert_equal 'oh noes', exception.message
+ end
+ end
+ end
+end

0 comments on commit a448e74

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