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

Ensure content type gets reset after render_to_string [#1182 state:resolved]

Browse source
This commit is contained in:
Joshua Peek 2008-10-30 15:25:36 -05:00
parent 7857e42103
commit 2092687bcb
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
actionpack/lib/action_controller/base.rb
View file

@ -933,6 +933,7 @@ module ActionController #:nodoc:
def render_to_string(options = nil, &block) #:doc: def render_to_string(options = nil, &block) #:doc:
render(options, &block) render(options, &block)
ensure ensure
response.content_type = nil
erase_render_results erase_render_results
reset_variables_added_to_assigns reset_variables_added_to_assigns
end end

10
actionpack/test/controller/render_test.rb
View file

@ -154,6 +154,10 @@ class TestController < ActionController::Base
render :json => {:hello => 'world'}.to_json render :json => {:hello => 'world'}.to_json
end end
def render_json_with_render_to_string
render :json => {:hello => render_to_string(:partial => 'partial')}
end
def render_custom_code def render_custom_code
render :text => "hello world", :status => 404 render :text => "hello world", :status => 404
end end
@ -772,6 +776,12 @@ class RenderTest < Test::Unit::TestCase
assert_equal 'application/json', @response.content_type assert_equal 'application/json', @response.content_type
end end
def test_render_json_with_render_to_string
get :render_json_with_render_to_string
assert_equal '{"hello": "partial html"}', @response.body
assert_equal 'application/json', @response.content_type
end
def test_render_custom_code def test_render_custom_code
get :render_custom_code get :render_custom_code
assert_response 404 assert_response 404