Index: test/controller/action_pack_assertions_test.rb =================================================================== --- test/controller/action_pack_assertions_test.rb (リビジョン 3499) +++ test/controller/action_pack_assertions_test.rb (作業コピー) @@ -485,6 +485,6 @@ def test_rendering_xml_respects_content_type @response.headers['Content-Type'] = 'application/pdf' process :hello_xml_world - assert_equal('application/pdf', @controller.headers['Content-Type']) + assert_equal('text/xml', @controller.headers['Content-Type']) end end \ ファイルの末尾に改行がありません Index: test/controller/new_render_test.rb =================================================================== --- test/controller/new_render_test.rb (リビジョン 3499) +++ test/controller/new_render_test.rb (作業コピー) @@ -369,6 +369,16 @@ assert_equal %!["person"].each(Element.remove);\nnew Effect.Highlight('project-4',{});!, @response.body end + def test_rendering_rjs_sets_content_type + process :render_js_with_explicit_template + assert_equal('text/javascript', @controller.headers['Content-Type']) + end + def test_rendering_rjs_respects_content_type + @response.headers['Content-Type'] = 'application/pdf' + process :render_js_with_explicit_template + assert_equal('text/javascript', @controller.headers['Content-Type']) + end + def test_layout_rendering get :layout_test assert_equal "Hello world!", @response.body Index: lib/action_view/base.rb =================================================================== --- lib/action_view/base.rb (リビジョン 3499) +++ lib/action_view/base.rb (作業コピー) @@ -394,10 +394,10 @@ body = case extension.to_sym when :rxml "xml = Builder::XmlMarkup.new(:indent => 2)\n" + - "@controller.headers['Content-Type'] ||= 'text/xml'\n" + + "@controller.headers['Content-Type'] = 'text/xml'\n" + template when :rjs - "@controller.headers['Content-Type'] ||= 'text/javascript'\n" + + "@controller.headers['Content-Type'] = 'text/javascript'\n" + "update_page do |page|\n#{template}\nend" end else