diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-04-21 10:58:20 -0300 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-04-21 10:58:20 -0300 |
| commit | 81f4a7dce42e4a81f02c4b2d060d92b718b03d5a (patch) | |
| tree | 015913ae72dd480d4641a48aafe0f080106d6953 /actionpack/test/controller/renderer_test.rb | |
| parent | 875c679a3397a1c41d70b66f5e353926dbd652a5 (diff) | |
| parent | 7bd2f9177342c57a81880425ab134945aea6fbd9 (diff) | |
| download | rails-81f4a7dce42e4a81f02c4b2d060d92b718b03d5a.tar.gz rails-81f4a7dce42e4a81f02c4b2d060d92b718b03d5a.tar.bz2 rails-81f4a7dce42e4a81f02c4b2d060d92b718b03d5a.zip | |
Merge pull request #24661 from maclover7/fix-22975
Fix ApplicationController.renderer.defaults.merge!
Diffstat (limited to 'actionpack/test/controller/renderer_test.rb')
| -rw-r--r-- | actionpack/test/controller/renderer_test.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/actionpack/test/controller/renderer_test.rb b/actionpack/test/controller/renderer_test.rb index 16d24fa82a..372c09bc23 100644 --- a/actionpack/test/controller/renderer_test.rb +++ b/actionpack/test/controller/renderer_test.rb @@ -87,6 +87,14 @@ class RendererTest < ActiveSupport::TestCase assert_equal "<p>1\n<br />2</p>", render[inline: '<%= simple_format "1\n2" %>'] end + test 'rendering with user specified defaults' do + ApplicationController.renderer.defaults.merge!({ hello: 'hello', https: true }) + renderer = ApplicationController.renderer.new + content = renderer.render inline: '<%= request.ssl? %>' + + assert_equal 'true', content + end + private def render @render ||= ApplicationController.renderer.method(:render) |