kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #11437 from kennyj/fix_11393

Browse source 
Fix #11393. Fix default rendered format when calling render method without :content_type option.
This commit is contained in:
Guillermo Iguaran 2013-07-14 10:30:59 -07:00
commit b5e851e90b
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
actionview/CHANGELOG.md
View file

@ -1,3 +1,8 @@
* Fix default rendered format problem when calling `render` without :content_type option.
It should return :html. Fix #11393.
*Gleb Mazovetskiy* *Oleg* *kennyj*
* Fix `link_to` with block and url hashes.
Before:

2
actionview/lib/action_view/renderer/template_renderer.rb
View file

@ -11,7 +11,7 @@ module ActionView
prepend_formats(template.formats)
unless context.rendered_format
context.rendered_format = template.formats.first || formats.last
context.rendered_format = template.formats.first || formats.first
end
render_template(template, options[:layout], options[:locals])

5
actionview/test/template/render_test.rb
View file

@ -41,6 +41,11 @@ module RenderTestCases
assert_match "<error>No Comment</error>", @view.render(:template => "comments/empty", :formats => [:xml])
end
def test_rendered_format_without_format
@view.render(:inline => "test")
assert_equal :html, @view.lookup_context.rendered_format
end
def test_render_partial_implicitly_use_format_of_the_rendered_template
@view.lookup_context.formats = [:json]
assert_equal "Hello world", @view.render(:template => "test/one", :formats => [:html])