Merge branch 'master' into nested_has_many_through

1 files changed, 57 insertions, 0 deletions

diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb
new file mode 100644
index 0000000000..7e65c63062
--- /dev/null
+++ b/activesupport/test/test_case_test.rb
@@ -0,0 +1,57 @@
+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
+
+      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