aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-04-15 21:37:11 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2010-04-16 11:03:16 -0300
commit462a7b45f6b72865a3d2d9411083512c6e1c1a66 (patch)
tree32cd5e865417e756fcf4cda9f2ba145eb6c9ec16 /actionpack/test
parent8a91ccf97632ef949f3f99e8956b8235091389a7 (diff)
downloadrails-462a7b45f6b72865a3d2d9411083512c6e1c1a66.tar.gz
rails-462a7b45f6b72865a3d2d9411083512c6e1c1a66.tar.bz2
rails-462a7b45f6b72865a3d2d9411083512c6e1c1a66.zip
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.
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/new_base/content_type_test.rb10
1 files changed, 1 insertions, 9 deletions
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" => "<xml>Hello world!</xml>",
"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