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

This commit is contained in:
Piotr Sarnacki 2012-03-02 12:46:24 -02:00 committed by Santiago Pastorino
parent 974a9dbaa3
commit aeeebe1fdc
2 changed files with 8 additions and 2 deletions

View File

@ -272,6 +272,8 @@ module ActionView
@block = block
@details = extract_details(options)
@lookup_context.rendered_format ||= formats.first
if String === partial
@object = options[:object]
@path = partial

View File

@ -1246,22 +1246,26 @@ class RenderTest < ActionController::TestCase
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