From 449039a86d802871b707dfb51ac1ed96d53526f9 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Mon, 23 Jul 2012 13:50:48 -0300 Subject: Remove ActionDispatch::Head middleware in favor of Rack::Head Closes #7110 there's more work to do on rack-cache issue 69 --- actionpack/test/abstract_unit.rb | 2 +- actionpack/test/dispatch/request_test.rb | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'actionpack/test') diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 37deb9c98a..8c7f6474e5 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -171,7 +171,7 @@ class ActionDispatch::IntegrationTest < ActiveSupport::TestCase middleware.use "ActionDispatch::ParamsParser" middleware.use "ActionDispatch::Cookies" middleware.use "ActionDispatch::Flash" - middleware.use "ActionDispatch::Head" + middleware.use "Rack::Head" yield(middleware) if block_given? end end diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb index 54fc1b208d..a434e49dbd 100644 --- a/actionpack/test/dispatch/request_test.rb +++ b/actionpack/test/dispatch/request_test.rb @@ -461,14 +461,6 @@ class RequestTest < ActiveSupport::TestCase end end - test "head masquerading as get" do - request = stub_request 'REQUEST_METHOD' => 'GET', "rack.methodoverride.original_method" => "HEAD" - assert_equal "HEAD", request.method - assert_equal "GET", request.request_method - assert request.get? - assert request.head? - end - test "post masquerading as patch" do request = stub_request 'REQUEST_METHOD' => 'PATCH', "rack.methodoverride.original_method" => "POST" assert_equal "POST", request.method -- cgit v1.2.3