1 files changed, 19 insertions, 0 deletions
diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb
index 8a5006cdf2..7e65c63062 100644
--- a/activesupport/test/test_case_test.rb
+++ b/activesupport/test/test_case_test.rb
@@ -33,6 +33,25 @@ module ActiveSupport
         assert_equal test_name, name
         assert_equal '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
+
+        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