Make HEAD method masquerade as GET so requests are routed correctly

3 files changed, 16 insertions, 3 deletions

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 3e631d45df..f26542b31e 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -91,7 +91,7 @@ class ActionController::IntegrationTest < ActiveSupport::TestCase
       middleware.use "ActionDispatch::ShowExceptions"
       middleware.use "ActionDispatch::Callbacks"
       middleware.use "ActionDispatch::ParamsParser"
-      middleware.use "Rack::Head"
+      middleware.use "ActionDispatch::Head"
     }.build(routes || ActionController::Routing::Routes)
   end
 
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 624b14e69b..683ab5236c 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -254,6 +254,10 @@ class IntegrationProcessTest < ActionController::IntegrationTest
       render :text => "Created", :status => 201
     end
 
+    def method
+      render :text => "method: #{request.method}"
+    end
+
     def cookie_monster
       cookies["cookie_1"] = nil
       cookies["cookie_3"] = "chocolate"
@@ -379,6 +383,14 @@ class IntegrationProcessTest < ActionController::IntegrationTest
       head '/post'
       assert_equal 201, status
       assert_equal "", body
+
+      get '/get/method'
+      assert_equal 200, status
+      assert_equal "method: get", body
+
+      head '/get/method'
+      assert_equal 200, status
+      assert_equal "", body
     end
   end
 
@@ -391,6 +403,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest
       with_routing do |set|
         set.draw do |map|
           match ':action', :to => ::IntegrationProcessTest::IntegrationController
+          get 'get/:action', :to => ::IntegrationProcessTest::IntegrationController
         end
         yield
       end
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index b62df9a6b2..cb95ecea50 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -319,7 +319,7 @@ class RequestTest < ActiveSupport::TestCase
   end
 
   test "allow method hacking on post" do
-    [:get, :head, :options, :put, :post, :delete].each do |method|
+    [:get, :options, :put, :post, :delete].each do |method|
       request = stub_request "REQUEST_METHOD" => method.to_s.upcase
       assert_equal(method == :head ? :get : method, request.method)
     end
@@ -341,7 +341,7 @@ class RequestTest < ActiveSupport::TestCase
   end
 
   test "head masquerading as get" do
-    request = stub_request 'REQUEST_METHOD' => 'HEAD'
+    request = stub_request 'REQUEST_METHOD' => 'GET', "rack.methodoverride.original_method" => "HEAD"
     assert_equal :get, request.method
     assert request.get?
     assert request.head?