mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #42855 from kamipo/fix_to_json 

Fix `to_json` after `changes_applied` for `ActiveModel::Dirty` object
This commit is contained in:
Ryuta Kamizono 2021-07-24 08:38:23 +09:00 committed by GitHub
parent 6abe728e1d 0f001f00eb
commit 2a6459d8ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemodel/lib/active_model/dirty.rb
View File

@ -141,7 +141,7 @@ module ActiveModel
end
def as_json(options = {}) # :nodoc:
options[:except] = [options[:except], "mutations_from_database"].flatten
options[:except] = [*options[:except], "mutations_from_database", "mutations_before_last_save"]
super(options)
end

10
activemodel/test/cases/dirty_test.rb
View File

@ -244,13 +244,19 @@ class DirtyTest < ActiveModel::TestCase
assert_equal "{\"name\":\"Dmitry\",\"color\":null,\"size\":null,\"status\":\"initialized\"}", @model.to_json
end
test "to_json should work on model with :except string option " do
test "to_json should work on model with :except string option" do
@model.name = "Dmitry"
assert_equal "{\"color\":null,\"size\":null,\"status\":\"initialized\"}", @model.to_json(except: "name")
end
test "to_json should work on model with :except array option " do
test "to_json should work on model with :except array option" do
@model.name = "Dmitry"
assert_equal "{\"color\":null,\"size\":null,\"status\":\"initialized\"}", @model.to_json(except: ["name"])
end
test "to_json should work on model after save" do
@model.name = "Dmitry"
@model.save
assert_equal "{\"name\":\"Dmitry\",\"color\":null,\"size\":null,\"status\":\"initialized\"}", @model.to_json
end
end