diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2019-02-11 17:24:24 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2019-02-11 17:55:59 -0800 |
| commit | 2b6d2d20374130da469ece24842ce3b681d3b788 (patch) | |
| tree | affbde8be64402578fbef1f5a15950e418e7b4fc /actionview/test/template/log_subscriber_test.rb | |
| parent | 9439a18bf76b3b7c759340abf0d7a5fb17fc82f7 (diff) | |
| download | rails-2b6d2d20374130da469ece24842ce3b681d3b788.tar.gz rails-2b6d2d20374130da469ece24842ce3b681d3b788.tar.bz2 rails-2b6d2d20374130da469ece24842ce3b681d3b788.zip | |
Turn lookup context in to a stack, push and pop if formats change
This commit keeps a stack of lookup contexts on the ActionView::Base
instance. If a format is passed to render, we instantiate a new lookup
context and push it on the stack, that way any child calls to "render"
will use the same format information as the parent. This also isolates
"sibling" calls to render (multiple calls to render in the same
template).
Fixes #35222 #34138
Diffstat (limited to 'actionview/test/template/log_subscriber_test.rb')
| -rw-r--r-- | actionview/test/template/log_subscriber_test.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionview/test/template/log_subscriber_test.rb b/actionview/test/template/log_subscriber_test.rb index 83bb651ea3..85735139c1 100644 --- a/actionview/test/template/log_subscriber_test.rb +++ b/actionview/test/template/log_subscriber_test.rb @@ -16,8 +16,7 @@ class AVLogSubscriberTest < ActiveSupport::TestCase view_paths = ActionController::Base.view_paths lookup_context = ActionView::LookupContext.new(view_paths, {}, ["test"]) - renderer = ActionView::Renderer.new(lookup_context) - @view = ActionView::Base.with_empty_template_cache.new(renderer, {}) + @view = ActionView::Base.with_empty_template_cache.new(lookup_context, {}) ActionView::LogSubscriber.attach_to :action_view |