kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #26418 from y-yagi/fixes_26415

Browse source 
call `.to_h` to avoid using deprecated method
This commit is contained in:
Richard Schneeman 2016-09-07 10:46:48 -05:00 committed by Kasper Timm Hansen
parent dd76b1ed75
commit 71487a3fd1
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/lib/action_controller/metal/strong_parameters.rb
View file

@ -577,7 +577,7 @@ module ActionController
# +other_hash+ merges into current hash.
def merge(other_hash)
new_instance_with_inherited_permitted_status(
@parameters.merge(other_hash)
@parameters.merge(other_hash.to_h)
)
end

7
actionpack/test/controller/parameters/parameters_permit_test.rb
View file

@ -237,6 +237,13 @@ class ParametersPermitTest < ActiveSupport::TestCase
assert @params.merge(a: "b").permitted?
end
test "merge with parameters" do
other_params = ActionController::Parameters.new(id: "1234").permit!
merged_params = @params.merge(other_params)
assert merged_params[:id]
end
test "modifying the parameters" do
@params[:person][:hometown] = "Chicago"
@params[:person][:family] = { brother: "Jonas" }