2 files changed, 56 insertions, 5 deletions
diff --git a/activesupport/test/json/encoding_test.rb b/activesupport/test/json/encoding_test.rb
index 8cf1a54a99..d327f34140 100644
--- a/activesupport/test/json/encoding_test.rb
+++ b/activesupport/test/json/encoding_test.rb
@@ -3,7 +3,7 @@ require 'abstract_unit'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/json'
 
-class TestJSONEncoding < Test::Unit::TestCase
+class TestJSONEncoding < ActiveSupport::TestCase
   class Foo
     def initialize(a, b)
       @a, @b = a, b
@@ -46,8 +46,6 @@ class TestJSONEncoding < Test::Unit::TestCase
   HashlikeTests = [[ Hashlike.new, %({\"a\":1}) ]]
   CustomTests   = [[ Custom.new, '"custom"' ]]
 
-  VariableTests = [[ ActiveSupport::JSON::Variable.new('foo'), 'foo'],
-                   [ ActiveSupport::JSON::Variable.new('alert("foo")'), 'alert("foo")']]
   RegexpTests   = [[ /^a/, '"(?-mix:^a)"' ], [/^\w{1,2}[a-z]+/ix, '"(?ix-m:^\\\\w{1,2}[a-z]+)"']]
 
   DateTests     = [[ Date.new(2005,2,1), %("2005/02/01") ]]
@@ -79,6 +77,13 @@ class TestJSONEncoding < Test::Unit::TestCase
     end
   end
 
+  def test_json_variable
+    assert_deprecated do
+      assert_equal ActiveSupport::JSON::Variable.new('foo'), 'foo'
+      assert_equal ActiveSupport::JSON::Variable.new('alert("foo")'), 'alert("foo")'
+    end
+  end
+
   def test_hash_encoding
     assert_equal %({\"a\":\"b\"}), ActiveSupport::JSON.encode(:a => :b)
     assert_equal %({\"a\":1}), ActiveSupport::JSON.encode('a' => 1)
@@ -270,6 +275,12 @@ class TestJSONEncoding < Test::Unit::TestCase
                  JSON.parse(json_string_and_date))
   end
 
+  def test_nil_true_and_false_represented_as_themselves
+    assert_equal nil,   nil.as_json
+    assert_equal true,  true.as_json
+    assert_equal false, false.as_json
+  end
+
   protected
 
     def object_keys(json_object)
diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb
index 756d21b3e4..c4653b1ae6 100644
--- a/activesupport/test/test_case_test.rb
+++ b/activesupport/test/test_case_test.rb
@@ -19,7 +19,7 @@ module ActiveSupport
     end
 
     if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
-      def test_callback_with_exception
+      def test_standard_error_raised_within_setup_callback_is_puked
         tc = Class.new(TestCase) do
           setup :bad_callback
           def bad_callback; raise 'oh noes' end
@@ -38,7 +38,7 @@ module ActiveSupport
         assert_equal 'oh noes', exception.message
       end
 
-      def test_teardown_callback_with_exception
+      def test_standard_error_raised_within_teardown_callback_is_puked
         tc = Class.new(TestCase) do
           teardown :bad_callback
           def bad_callback; raise 'oh noes' end
@@ -56,6 +56,46 @@ module ActiveSupport
         assert_equal test_name, name
         assert_equal 'oh noes', exception.message
       end
+
+      def test_passthrough_exception_raised_within_test_method_is_not_rescued
+        tc = Class.new(TestCase) do
+          def test_which_raises_interrupt; raise Interrupt; end
+        end
+
+        test_name = 'test_which_raises_interrupt'
+        fr = FakeRunner.new
+
+        test = tc.new test_name
+        assert_raises(Interrupt) { test.run fr }
+      end
+
+      def test_passthrough_exception_raised_within_setup_callback_is_not_rescued
+        tc = Class.new(TestCase) do
+          setup :callback_which_raises_interrupt
+          def callback_which_raises_interrupt; raise Interrupt; end
+          def test_true; assert true end
+        end
+
+        test_name = 'test_true'
+        fr = FakeRunner.new
+
+        test = tc.new test_name
+        assert_raises(Interrupt) { test.run fr }
+      end
+
+      def test_passthrough_exception_raised_within_teardown_callback_is_not_rescued
+        tc = Class.new(TestCase) do
+          teardown :callback_which_raises_interrupt
+          def callback_which_raises_interrupt; raise Interrupt; end
+          def test_true; assert true end
+        end
+
+        test_name = 'test_true'
+        fr = FakeRunner.new
+
+        test = tc.new test_name
+        assert_raises(Interrupt) { test.run fr }
+      end
     end
   end
 end