diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2012-03-02 12:46:24 -0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-03-02 12:50:36 -0200 |
| commit | 1a71e84ad8b21144e4fa2b01cc3fc8d4fc375de1 (patch) | |
| tree | 0a98c16f9310b42b14d7633334d3148bec220b74 | |
| parent | bbe7dac2230c6c9410fda59f6b259d3e53ea437e (diff) | |
| download | rails-1a71e84ad8b21144e4fa2b01cc3fc8d4fc375de1.tar.gz rails-1a71e84ad8b21144e4fa2b01cc3fc8d4fc375de1.tar.bz2 rails-1a71e84ad8b21144e4fa2b01cc3fc8d4fc375de1.zip | |
Fix #5238, rendered_format is not set when template is not rendered
| -rw-r--r-- | actionpack/lib/action_view/renderer/partial_renderer.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/render_test.rb | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb index 374bdb62f5..17aa85555c 100644 --- a/actionpack/lib/action_view/renderer/partial_renderer.rb +++ b/actionpack/lib/action_view/renderer/partial_renderer.rb @@ -273,6 +273,8 @@ module ActionView @block = block @details = extract_details(options) + @lookup_context.rendered_format ||= formats.first + if String === partial @object = options[:object] @path = partial diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb index 28f6bc88e0..e9b0fe7008 100644 --- a/actionpack/test/controller/render_test.rb +++ b/actionpack/test/controller/render_test.rb @@ -1241,22 +1241,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 |