When Array#as_json and Hash#as_json are called without options, they

should also call #as_json on the children without options (instead of
nil)

1 files changed, 16 insertions, 0 deletions

diff --git a/activesupport/test/json/encoding_test.rb b/activesupport/test/json/encoding_test.rb
index 39da760bf2..00f43be6d4 100644
--- a/activesupport/test/json/encoding_test.rb
+++ b/activesupport/test/json/encoding_test.rb
@@ -32,6 +32,12 @@ class TestJSONEncoding < ActiveSupport::TestCase
     end
   end
 
+  class OptionsTest
+    def as_json(options = :default)
+      options
+    end
+  end
+
   class HashWithAsJson < Hash
     attr_accessor :as_json_called
 
@@ -332,6 +338,16 @@ class TestJSONEncoding < ActiveSupport::TestCase
                   "other_hash" => {"foo"=>"other_foo","test"=>"other_test"}}, ActiveSupport::JSON.decode(hash.to_json))
   end
 
+  def test_hash_as_json_without_options
+    json = { foo: OptionsTest.new }.as_json
+    assert_equal({"foo" => :default}, json)
+  end
+
+  def test_array_as_json_without_options
+    json = [ OptionsTest.new ].as_json
+    assert_equal([:default], json)
+  end
+
   def test_struct_encoding
     Struct.new('UserNameAndEmail', :name, :email)
     Struct.new('UserNameAndDate', :name, :date)