Permalink
Browse files

Set proper rendered_format when doing render :inline

Closes #5632
  • Loading branch information...
1 parent c82fd8f commit f0268d56afa6be2eb4eb1fb953821d241f5adfc9 @spastorino spastorino committed Mar 28, 2012
@@ -9,8 +9,8 @@ def render(context, options)
context = @lookup_context
unless context.rendered_format
- context.rendered_format = template.formats.first
- context.formats = template.formats
+ context.formats = template.formats unless template.formats.empty?
+ context.rendered_format = context.formats.first
end
render_template(template, options[:layout], options[:locals])
@@ -1022,6 +1022,7 @@ def test_accessing_params_in_template
def test_accessing_local_assigns_in_inline_template
get :accessing_local_assigns_in_inline_template, :local_name => "Local David"
assert_equal "Goodbye, Local David", @response.body
+ assert_equal "text/html", @response.content_type
end
def test_should_implicitly_render_html_template_from_xhr_request

0 comments on commit f0268d5

Please sign in to comment.