3 files changed, 31 insertions, 25 deletions

diff --git a/actionpack/test/controller/renderer_test.rb b/actionpack/test/controller/renderer_test.rb
index b55a25430b..16d24fa82a 100644
--- a/actionpack/test/controller/renderer_test.rb
+++ b/actionpack/test/controller/renderer_test.rb
@@ -1,6 +1,10 @@
 require 'abstract_unit'
 
 class RendererTest < ActiveSupport::TestCase
+  test 'action controller base has a renderer' do
+    assert ActionController::Base.renderer
+  end
+
   test 'creating with a controller' do
     controller = CommentsController
     renderer   = ActionController::Renderer.for controller
@@ -57,8 +61,7 @@ class RendererTest < ActiveSupport::TestCase
   end
 
   test 'rendering with defaults' do
-    renderer = ApplicationController.renderer
-    renderer.defaults[:https] = true
+    renderer = ApplicationController.renderer.new https: true
     content = renderer.render inline: '<%= request.ssl? %>'
 
     assert_equal 'true', content
@@ -67,8 +70,8 @@ class RendererTest < ActiveSupport::TestCase
   test 'same defaults from the same controller' do
     renderer_defaults = ->(controller) { controller.renderer.defaults }
 
-    assert renderer_defaults[AccountsController].equal? renderer_defaults[AccountsController]
-    assert_not renderer_defaults[AccountsController].equal? renderer_defaults[CommentsController]
+    assert_equal renderer_defaults[AccountsController], renderer_defaults[AccountsController]
+    assert_equal renderer_defaults[AccountsController], renderer_defaults[CommentsController]
   end
 
   test 'rendering with different formats' do
@@ -83,18 +86,6 @@ class RendererTest < ActiveSupport::TestCase
   test 'rendering with helpers' do
     assert_equal "<p>1\n<br />2</p>", render[inline: '<%= simple_format "1\n2" %>']
   end
-  
-  test 'rendering from inherited renderer' do
-    inherited = Class.new ApplicationController.renderer do
-      defaults[:script_name] = 'script'
-      def render(options)
-        super options.merge(locals: { param: :value })
-      end
-    end
-
-    template = '<%= url_for controller: :foo, action: :bar, param: param %>'
-    assert_equal 'script/foo/bar?param=value', inherited.render(inline: template)
-  end
 
   private
     def render
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index c0ddcf7f50..fb9883fb18 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -143,7 +143,18 @@ class SendFileTest < ActionController::TestCase
     }
 
     @controller.headers = {}
-    assert_raise(ArgumentError) { @controller.send(:send_file_headers!, options) }
+    error = assert_raise(ArgumentError) { @controller.send(:send_file_headers!, options) }
+    assert_equal "Unknown MIME type #{options[:type]}", error.message
+  end
+
+  def test_send_file_headers_with_nil_content_type
+    options = {
+      :type => nil
+    }
+
+    @controller.headers = {}
+    error = assert_raise(ArgumentError) { @controller.send(:send_file_headers!, options) }
+    assert_equal ":type option required", error.message
   end
 
   def test_send_file_headers_guess_type_from_extension
diff --git a/actionpack/test/controller/webservice_test.rb b/actionpack/test/controller/webservice_test.rb
index b26f037c36..8b37c9599e 100644
--- a/actionpack/test/controller/webservice_test.rb
+++ b/actionpack/test/controller/webservice_test.rb
@@ -97,24 +97,28 @@ class WebServiceTest < ActionDispatch::IntegrationTest
   end
 
   def test_parsing_json_doesnot_rescue_exception
-    with_test_route_set do
-      with_params_parsers Mime::JSON => Proc.new { |data| raise Interrupt } do
-        assert_raises(Interrupt) do
-          post "/",
-            params: '{"title":"JSON"}}',
-            headers: { 'CONTENT_TYPE' => 'application/json' }
-        end
+    req = Class.new(ActionDispatch::Request) do
+      def params_parsers
+        { Mime::JSON => Proc.new { |data| raise Interrupt } }
       end
+
+      def content_length; get_header('rack.input').length; end
+    end.new({ 'rack.input' => StringIO.new('{"title":"JSON"}}'), 'CONTENT_TYPE' => 'application/json' })
+
+    assert_raises(Interrupt) do
+      req.request_parameters
     end
   end
 
   private
     def with_params_parsers(parsers = {})
       old_session = @integration_session
-      @app = ActionDispatch::ParamsParser.new(app.routes, parsers)
+      original_parsers = ActionDispatch::Request.parameter_parsers
+      ActionDispatch::Request.parameter_parsers = original_parsers.merge parsers
       reset!
       yield
     ensure
+      ActionDispatch::Request.parameter_parsers = original_parsers
       @integration_session = old_session
     end