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

Move inline rendering content-type test to a controller test

Browse source 
This commit is to remove direct access to the "rendered_format"
attribute on the lookup context.  "rendered_format" is an implementation
detail that we shouldn't test directly.
This commit is contained in:
Aaron Patterson 2019-02-13 17:17:48 -08:00
parent 4f77982e21
commit d0733ba8c0
No known key found for this signature in database
GPG key ID: 953170BCB4FFAFC6
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
actionview/test/actionpack/controller/render_test.rb
View file

@ -174,6 +174,10 @@ class TestController < ActionController::Base
render inline: "<%= controller_name %>" render inline: "<%= controller_name %>"
end end
def inline_rendered_format_without_format
render inline: "test"
end
# :ported: # :ported:
def render_custom_code def render_custom_code
render plain: "hello world", status: 404 render plain: "hello world", status: 404
@ -659,6 +663,7 @@ class RenderTest < ActionController::TestCase
get :hello_world_from_rxml_using_action, to: "test#hello_world_from_rxml_using_action" get :hello_world_from_rxml_using_action, to: "test#hello_world_from_rxml_using_action"
get :hello_world_from_rxml_using_template, to: "test#hello_world_from_rxml_using_template" get :hello_world_from_rxml_using_template, to: "test#hello_world_from_rxml_using_template"
get :hello_world_with_layout_false, to: "test#hello_world_with_layout_false" get :hello_world_with_layout_false, to: "test#hello_world_with_layout_false"
get :inline_rendered_format_without_format, to: "test#inline_rendered_format_without_format"
get :layout_overriding_layout, to: "test#layout_overriding_layout" get :layout_overriding_layout, to: "test#layout_overriding_layout"
get :layout_test, to: "test#layout_test" get :layout_test, to: "test#layout_test"
get :layout_test_with_different_layout, to: "test#layout_test_with_different_layout" get :layout_test_with_different_layout, to: "test#layout_test_with_different_layout"
@ -1015,6 +1020,12 @@ class RenderTest < ActionController::TestCase
assert_equal "<wrapper>\n<html>\n <p>Hello </p>\n<p>This is grand!</p>\n</html>\n</wrapper>\n", @response.body assert_equal "<wrapper>\n<html>\n <p>Hello </p>\n<p>This is grand!</p>\n</html>\n</wrapper>\n", @response.body
end end
def test_rendered_format_without_format
get :inline_rendered_format_without_format
assert_equal "test", @response.body
assert_equal "text/html", @response.content_type
end
def test_partials_list def test_partials_list
get :partials_list get :partials_list
assert_equal "goodbyeHello: davidHello: marygoodbye\n", @response.body assert_equal "goodbyeHello: davidHello: marygoodbye\n", @response.body

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

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