Permalink
Browse files

Fix #5238, rendered_format is not set when template is not rendered

  • Loading branch information...
1 parent 974a9db commit aeeebe1fdca56d20a9950f5585d10f8089388278 @drogus drogus committed with spastorino Mar 2, 2012
@@ -272,6 +272,8 @@ def setup(context, options, block)
@block = block
@details = extract_details(options)
+ @lookup_context.rendered_format ||= formats.first
+
if String === partial
@object = options[:object]
@path = partial
@@ -1246,22 +1246,26 @@ def test_using_layout_around_block_in_main_layout_and_within_content_for_layout
def test_partial_only
get :partial_only
assert_equal "only partial", @response.body
+ assert_equal "text/html", @response.content_type
end
def test_should_render_html_formatted_partial
get :partial
- assert_equal 'partial html', @response.body
+ assert_equal "partial html", @response.body
+ assert_equal "text/html", @response.content_type
end
def test_should_render_html_partial_with_formats
get :partial_formats_html
- assert_equal 'partial html', @response.body
+ assert_equal "partial html", @response.body
+ assert_equal "text/html", @response.content_type
end
def test_render_to_string_partial
get :render_to_string_with_partial
assert_equal "only partial", assigns(:partial_only)
assert_equal "Hello: david", assigns(:partial_with_locals)
+ assert_equal "text/html", @response.content_type
end
def test_partial_with_counter

0 comments on commit aeeebe1

Please sign in to comment.