Merge branch 'master' of https://github.com/rails/rails into performance_test

1 files changed, 1 insertions, 8 deletions

diff --git a/actionpack/test/controller/new_base/content_type_test.rb b/actionpack/test/controller/new_base/content_type_test.rb
index 8ba30944f5..4b70031c90 100644
--- a/actionpack/test/controller/new_base/content_type_test.rb
+++ b/actionpack/test/controller/new_base/content_type_test.rb
@@ -23,8 +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_js_rjs.js.rjs"             => "page.alert 'hello'"
+      "content_type/implied/i_am_xml_builder.xml.builder"   => "xml.awesome 'Hello'"
     )]
   end
 
@@ -93,12 +92,6 @@ module ContentType
 
       assert_header "Content-Type", "application/xml; charset=utf-8"
     end
-
-    test "sets Content-Type as text/javascript when rendering *.js" do
-      get "/content_type/implied/i_am_js_rjs", "format" => "js"
-
-      assert_header "Content-Type", "text/javascript; charset=utf-8"
-    end
   end
 
   class ExplicitCharsetTest < Rack::TestCase