1 files changed, 43 insertions, 17 deletions
diff --git a/activesupport/test/json/decoding_test.rb b/activesupport/test/json/decoding_test.rb
index d1454902e5..80bf255080 100644
--- a/activesupport/test/json/decoding_test.rb
+++ b/activesupport/test/json/decoding_test.rb
@@ -4,6 +4,12 @@ require 'active_support/json'
 require 'active_support/time'
 
 class TestJSONDecoding < ActiveSupport::TestCase
+  class Foo
+    def self.json_create(object)
+      "Foo"
+    end
+  end
+
   TESTS = {
     %q({"returnTo":{"\/categories":"\/"}})        => {"returnTo" => {"/categories" => "/"}},
     %q({"return\\"To\\":":{"\/categories":"\/"}}) => {"return\"To\":" => {"/categories" => "/"}},
@@ -52,36 +58,56 @@ class TestJSONDecoding < ActiveSupport::TestCase
     # tests escaping of "\n" char with Yaml backend
     %q({"a":"\n"})  => {"a"=>"\n"},
     %q({"a":"\u000a"}) => {"a"=>"\n"},
-    %q({"a":"Line1\u000aLine2"}) => {"a"=>"Line1\nLine2"}
+    %q({"a":"Line1\u000aLine2"}) => {"a"=>"Line1\nLine2"},
+    # prevent json unmarshalling
+    %q({"json_class":"TestJSONDecoding::Foo"}) => {"json_class"=>"TestJSONDecoding::Foo"},
+    # json "fragments" - these are invalid JSON, but ActionPack relies on this
+    %q("a string") => "a string",
+    %q(1.1) => 1.1,
+    %q(1) => 1,
+    %q(-1) => -1,
+    %q(true) => true,
+    %q(false) => false,
+    %q(null) => nil
   }
 
-  backends = [:ok_json]
-  backends << :json_gem if defined?(::JSON)
-  backends << :yajl if defined?(::Yajl)
-
-  backends.each do |backend|
-    TESTS.each do |json, expected|
-      test "json decodes #{json} with the #{backend} backend" do
-        ActiveSupport.parse_json_times = true
+  TESTS.each_with_index do |(json, expected), index|
+    test "json decodes #{index}" do
+      with_parse_json_times(true) do
         silence_warnings do
-          ActiveSupport::JSON.with_backend backend do
-            assert_equal expected, ActiveSupport::JSON.decode(json)
-          end
+          assert_equal expected, ActiveSupport::JSON.decode(json), "JSON decoding \
+          failed for #{json}"
         end
       end
     end
+  end
 
-    test "json decodes time json with time parsing disabled with the #{backend} backend" do
-      ActiveSupport.parse_json_times = false
+  test "json decodes time json with time parsing disabled" do
+    with_parse_json_times(false) do
       expected = {"a" => "2007-01-01 01:12:34 Z"}
-      ActiveSupport::JSON.with_backend backend do
-        assert_equal expected, ActiveSupport::JSON.decode(%({"a": "2007-01-01 01:12:34 Z"}))
-      end
+      assert_equal expected, ActiveSupport::JSON.decode(%({"a": "2007-01-01 01:12:34 Z"}))
     end
   end
 
   def test_failed_json_decoding
+    assert_raise(ActiveSupport::JSON.parse_error) { ActiveSupport::JSON.decode(%(undefined)) }
+    assert_raise(ActiveSupport::JSON.parse_error) { ActiveSupport::JSON.decode(%({a: 1})) }
     assert_raise(ActiveSupport::JSON.parse_error) { ActiveSupport::JSON.decode(%({: 1})) }
+    assert_raise(ActiveSupport::JSON.parse_error) { ActiveSupport::JSON.decode(%()) }
+  end
+
+  def test_cannot_pass_unsupported_options
+    assert_raise(ArgumentError) { ActiveSupport::JSON.decode("", create_additions: true) }
+  end
+
+  private
+
+  def with_parse_json_times(value)
+    old_value = ActiveSupport.parse_json_times
+    ActiveSupport.parse_json_times = value
+    yield
+  ensure
+    ActiveSupport.parse_json_times = old_value
   end
 end