diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2017-03-13 19:22:03 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-13 19:22:03 +0900 |
| commit | 11f10840936a323eda1a9eab02521eff9bdccedb (patch) | |
| tree | 989a99cba718bda0583cb512a35927d45f05161f /actionpack/test | |
| parent | 097612e8f5bc520bbcdd3c9134a3421eac4d624a (diff) | |
| parent | c5f8fe9379dc144a54ceb5663aa449d35d1bf405 (diff) | |
| download | rails-11f10840936a323eda1a9eab02521eff9bdccedb.tar.gz rails-11f10840936a323eda1a9eab02521eff9bdccedb.tar.bz2 rails-11f10840936a323eda1a9eab02521eff9bdccedb.zip | |
Merge pull request #28352 from alpaca-tc/fixes_renderer_with_defaults
Fixes ActionController::Rendering#with_defaults
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/controller/renderer_test.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/actionpack/test/controller/renderer_test.rb b/actionpack/test/controller/renderer_test.rb index 81b32a67b3..052c974d68 100644 --- a/actionpack/test/controller/renderer_test.rb +++ b/actionpack/test/controller/renderer_test.rb @@ -19,6 +19,16 @@ class RendererTest < ActiveSupport::TestCase assert_equal controller, renderer.controller end + test "creating with new defaults" do + renderer = ApplicationController.renderer + + new_defaults = { https: true } + new_renderer = renderer.with_defaults(new_defaults).new + content = new_renderer.render(inline: "<%= request.ssl? %>") + + assert_equal "true", content + end + test "rendering with a class renderer" do renderer = ApplicationController.renderer content = renderer.render template: "ruby_template" |