From 462a7b45f6b72865a3d2d9411083512c6e1c1a66 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Thu, 15 Apr 2010 21:37:11 -0300 Subject: Revert "Add test case which check content type when rendering rjs" partial in html template" rendering rjs in html doesn't make sense, it would just output javascript into the template, no script tag This reverts commit dc251389d1ab4303b80a22642f4241940b73cbe7. --- actionpack/test/controller/new_base/content_type_test.rb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'actionpack/test/controller/new_base') diff --git a/actionpack/test/controller/new_base/content_type_test.rb b/actionpack/test/controller/new_base/content_type_test.rb index 700b71a7f3..0ff5552b08 100644 --- a/actionpack/test/controller/new_base/content_type_test.rb +++ b/actionpack/test/controller/new_base/content_type_test.rb @@ -23,9 +23,7 @@ module ContentType "content_type/implied/i_am_html_erb.html.erb" => "Hello world!", "content_type/implied/i_am_xml_erb.xml.erb" => "Hello world!", "content_type/implied/i_am_html_builder.html.builder" => "xml.p 'Hello'", - "content_type/implied/i_am_xml_builder.xml.builder" => "xml.awesome 'Hello'", - "content_type/implied/i_am_rjs_in_html.html.erb" => "<%= render 'i_am_rjs_partial' %>", - "content_type/implied/_i_am_rjs_partial.js.rjs" => "" + "content_type/implied/i_am_xml_builder.xml.builder" => "xml.awesome 'Hello'" )] def i_am_html_erb() end @@ -93,12 +91,6 @@ module ContentType assert_header "Content-Type", "application/xml; charset=utf-8" end - - test "sets Content-Type as text/html when rendering *.html.erb with a RJS partial" do - get "/content_type/implied/i_am_rjs_in_html" - - assert_header "Content-Type", "text/html; charset=utf-8" - end end class ExplicitCharsetTest < Rack::TestCase -- cgit v1.2.3