From 75fb8dfb996f5c5d8b64d10ce7b27eeb681d5316 Mon Sep 17 00:00:00 2001 From: Luke Melia Date: Mon, 17 Nov 2008 22:09:22 -0600 Subject: Prevent assert_template failures when a render :inline is called before rendering a file-based template [#1383 state:resolved] Signed-off-by: Joshua Peek --- actionpack/lib/action_view/renderable.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_view/renderable.rb b/actionpack/lib/action_view/renderable.rb index c23b8cde89..5ff5569db6 100644 --- a/actionpack/lib/action_view/renderable.rb +++ b/actionpack/lib/action_view/renderable.rb @@ -29,7 +29,9 @@ module ActionView stack.push(self) # This is only used for TestResponse to set rendered_template - view.instance_variable_set(:@_first_render, self) unless view.instance_variable_get(:@_first_render) + unless is_a?(InlineTemplate) || view.instance_variable_get(:@_first_render) + view.instance_variable_set(:@_first_render, self) + end view.send(:_evaluate_assigns_and_ivars) view.send(:_set_controller_content_type, mime_type) if respond_to?(:mime_type) -- cgit v1.2.3