aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2016-10-15 10:53:43 -0400
committerGitHub <noreply@github.com>2016-10-15 10:53:43 -0400
commit28ce091f8239802a82c19743de039b2c1ec896d2 (patch)
tree7ddf3fce525d8cdd6f41bf110c5dc0c95a49d5da /actionpack/test
parent10781f30a0401224477b3295ea16f816d522c71f (diff)
parent6fccd7b6293dcae383757379c5c3809c6674084e (diff)
downloadrails-28ce091f8239802a82c19743de039b2c1ec896d2.tar.gz
rails-28ce091f8239802a82c19743de039b2c1ec896d2.tar.bz2
rails-28ce091f8239802a82c19743de039b2c1ec896d2.zip
Merge pull request #26786 from codeodor/patch-1
Allow any key in Renderer environment hash
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/renderer_test.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/actionpack/test/controller/renderer_test.rb b/actionpack/test/controller/renderer_test.rb
index d6f09f2d90..866600b935 100644
--- a/actionpack/test/controller/renderer_test.rb
+++ b/actionpack/test/controller/renderer_test.rb
@@ -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? %>"