From 449039a86d802871b707dfb51ac1ed96d53526f9 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
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
---
 railties/lib/rails/application.rb             | 2 +-
 railties/test/application/middleware_test.rb  | 2 +-
 railties/test/application/rack/logger_test.rb | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'railties')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index da5b33c0fb..048219002d 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -310,7 +310,7 @@ module Rails
         end
 
         middleware.use ::ActionDispatch::ParamsParser
-        middleware.use ::ActionDispatch::Head
+        middleware.use ::Rack::Head
         middleware.use ::Rack::ConditionalGet
         middleware.use ::Rack::ETag, "no-cache"
 
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index ba747bc633..9c9ed0cd6b 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -45,7 +45,7 @@ module ApplicationTests
         "ActionDispatch::Session::CookieStore",
         "ActionDispatch::Flash",
         "ActionDispatch::ParamsParser",
-        "ActionDispatch::Head",
+        "Rack::Head",
         "Rack::ConditionalGet",
         "Rack::ETag",
         "ActionDispatch::BestStandardsSupport"
diff --git a/railties/test/application/rack/logger_test.rb b/railties/test/application/rack/logger_test.rb
index 46fd09cb26..2f5bd3a764 100644
--- a/railties/test/application/rack/logger_test.rb
+++ b/railties/test/application/rack/logger_test.rb
@@ -26,12 +26,18 @@ module ApplicationTests
         @logs ||= @logger.logged(:info)
       end
 
-      test "logger logs proper HTTP verb and path" do
+      test "logger logs proper HTTP GET verb and path" do
         get "/blah"
         wait
         assert_match(/^Started GET "\/blah"/, logs[0])
       end
 
+      test "logger logs proper HTTP HEAD verb and path" do
+        head "/blah"
+        wait
+        assert_match(/^Started HEAD "\/blah"/, logs[0])
+      end
+
       test "logger logs HTTP verb override" do
         post "/", {:_method => 'put'}
         wait
-- 
cgit v1.2.3