From 6e78bbea90f744fb7de3bc93752d1519503a370d Mon Sep 17 00:00:00 2001 From: Matt Aimonetti Date: Thu, 22 Sep 2011 14:05:25 -0700 Subject: fixed a bug with the json serialization when the class setting is set to not include the root, but an instance is serialized with the root option passed as true --- activemodel/test/cases/serializers/json_serialization_test.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'activemodel/test') diff --git a/activemodel/test/cases/serializers/json_serialization_test.rb b/activemodel/test/cases/serializers/json_serialization_test.rb index 5e1e7d897a..40fdcf20ca 100644 --- a/activemodel/test/cases/serializers/json_serialization_test.rb +++ b/activemodel/test/cases/serializers/json_serialization_test.rb @@ -56,6 +56,16 @@ class JsonSerializationTest < ActiveModel::TestCase end end + test "should include root in json (option) even if the default is set to false" do + begin + Contact.include_root_in_json = false + json = @contact.to_json(:root => true) + assert_match %r{^\{"contact":\{}, json + ensure + Contact.include_root_in_json = true + end + end + test "should not include root in json (option)" do json = @contact.to_json(:root => false) -- cgit v1.2.3