mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #26786 from codeodor/patch-1
Allow any key in Renderer environment hash
This commit is contained in:
commit
28ce091f82
3 changed files with 16 additions and 1 deletions
|
@ -1,3 +1,8 @@
|
|||
* Allow keys not found in RACK_KEY_TRANSLATION for setting the environment when rendering
|
||||
arbitrary templates.
|
||||
|
||||
*Sammy Larbi*
|
||||
|
||||
* Remove deprecated support to non-keyword arguments in `ActionDispatch::IntegrationTest#process`,
|
||||
`#get`, `#post`, `#patch`, `#put`, `#delete`, and `#head`.
|
||||
|
||||
|
|
|
@ -102,7 +102,9 @@ module ActionController
|
|||
method: ->(v) { v.upcase },
|
||||
}
|
||||
|
||||
def rack_key_for(key); RACK_KEY_TRANSLATION[key]; end
|
||||
def rack_key_for(key)
|
||||
RACK_KEY_TRANSLATION.fetch(key, key.to_s)
|
||||
end
|
||||
|
||||
def rack_value_for(key, value)
|
||||
RACK_VALUE_TRANSLATION.fetch(key, IDENTITY).call value
|
||||
|
|
|
@ -60,6 +60,14 @@ class RendererTest < ActiveSupport::TestCase
|
|||
assert_equal "true", content
|
||||
end
|
||||
|
||||
test "rendering with custom env using a key that is not in RACK_KEY_TRANSLATION" do
|
||||
value = "warden is here"
|
||||
renderer = ApplicationController.renderer.new warden: value
|
||||
content = renderer.render inline: "<%= request.env['warden'] %>"
|
||||
|
||||
assert_equal value, content
|
||||
end
|
||||
|
||||
test "rendering with defaults" do
|
||||
renderer = ApplicationController.renderer.new https: true
|
||||
content = renderer.render inline: "<%= request.ssl? %>"
|
||||
|
|
Loading…
Reference in a new issue