From cc10288e5fdded5d4410d16c4bf6c6da0b55a23b Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 24 Jul 2014 10:59:29 +0800 Subject: Bug fix for assert_template when opening a new session. See https://github.com/rails/rails/pull/16234#commitcomment-7115670. --- actionpack/lib/action_controller/test_case.rb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 657924a16c..71cb224f22 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -12,8 +12,13 @@ module ActionController teardown :teardown_subscriptions end + RENDER_TEMPLATE_INSTANCE_VARIABLES = %w{partials templates layouts files}.freeze + def setup_subscriptions - reset_template_assertion + RENDER_TEMPLATE_INSTANCE_VARIABLES.each do |instance_variable| + instance_variable_set("@_#{instance_variable}", Hash.new(0)) + end + @_subscribers = [] @_subscribers << ActiveSupport::Notifications.subscribe("render_template.action_view") do |_name, _start, _finish, _id, payload| @@ -58,10 +63,9 @@ module ActionController end def reset_template_assertion - @_partials = Hash.new(0) - @_templates = Hash.new(0) - @_layouts = Hash.new(0) - @_files = Hash.new(0) + RENDER_TEMPLATE_INSTANCE_VARIABLES.each do |instance_variable| + instance_variable_get("@_#{instance_variable}").clear + end end # Asserts that the request was rendered with the appropriate template file or partials. -- cgit v1.2.3