make `render` work with AC::Params

In 4.2, since AC::Params inherited `Hash`, processing in the case of
`Hash` was done. But in 5.x, since AC::Params does not inherit `Hash`,
need to add care for AC::Params.

Related to 00285e7cf7
This commit is contained in:
yuuji.yaginuma 2017-01-15 14:06:57 +09:00
parent aaece61a53
commit 761afeb2bb
2 changed files with 5 additions and 2 deletions

View File

@ -313,7 +313,6 @@ class ExpiresInRenderTest < ActionController::TestCase
end
def test_permitted_dynamic_render_file_hash
skip "FIXME: this test passes on 4-2-stable but not master. Why?"
assert File.exist?(File.join(File.dirname(__FILE__), "../../test/abstract_unit.rb"))
response = get :dynamic_render_permit, params: { id: { file: '../\\../test/abstract_unit.rb' } }
assert_equal File.read(File.join(File.dirname(__FILE__), "../../test/abstract_unit.rb")),

View File

@ -124,7 +124,11 @@ module ActionView
key = action.include?(?/) ? :template : :action
options[key] = action
else
options[:partial] = action
if action.respond_to?(:permitted?) && action.permitted?
options = action
else
options[:partial] = action
end
end
options