diff options
author | Yves Senn <yves.senn@gmail.com> | 2013-03-04 20:30:05 +0100 |
---|---|---|
committer | Yves Senn <yves.senn@gmail.com> | 2013-03-04 21:18:40 +0100 |
commit | 8c7d4018e0ddec462075027defb3575c47952c3e (patch) | |
tree | 8ae96aba301c1d1d90996cefe077f674121fa2b2 /activerecord | |
parent | eeba67947031478e4376e349c91ea4d9ca185579 (diff) | |
download | rails-8c7d4018e0ddec462075027defb3575c47952c3e.tar.gz rails-8c7d4018e0ddec462075027defb3575c47952c3e.tar.bz2 rails-8c7d4018e0ddec462075027defb3575c47952c3e.zip |
`ActiveRecord::Base.include_root_in_json` is `false` by default.
Closes #9459.
The PR #6597 unified the configuration for `include_root_in_json`
in AM and AR to `false`.
Later on with the refactoring commit: e030f26 the value in AR was
set to `true` but I think this was not on purpose.
With this commit both AM and AR will have the same configuration
for `include_root_in_json`, which is `false`.
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/serialization.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/serialization_test.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/serialization.rb b/activerecord/lib/active_record/serialization.rb index 6b55af4205..bd9079b596 100644 --- a/activerecord/lib/active_record/serialization.rb +++ b/activerecord/lib/active_record/serialization.rb @@ -5,7 +5,7 @@ module ActiveRecord #:nodoc: include ActiveModel::Serializers::JSON included do - self.include_root_in_json = true + self.include_root_in_json = false end def serializable_hash(options = nil) diff --git a/activerecord/test/cases/serialization_test.rb b/activerecord/test/cases/serialization_test.rb index eb9cb91e32..c46060a646 100644 --- a/activerecord/test/cases/serialization_test.rb +++ b/activerecord/test/cases/serialization_test.rb @@ -18,6 +18,10 @@ class SerializationTest < ActiveRecord::TestCase } end + def test_include_root_in_json_is_false_by_default + assert_equal false, ActiveRecord::Base.include_root_in_json, "include_root_in_json should be false by default but was not" + end + def test_serialize_should_be_reversible FORMATS.each do |format| @serialized = Contact.new.send("to_#{format}") |