Logs should show overridden method; Issue 426

2 files changed, 42 insertions, 2 deletions

diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 01e6c49d9c..fd6dc46271 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -23,7 +23,8 @@ module ApplicationTests
         "Rack::Lock",
         "ActiveSupport::Cache::Strategy::LocalCache",
         "Rack::Runtime",
-        "Rails::Rack::Logger",
+        "Rack::MethodOverride",
+        "Rails::Rack::Logger", # must come after Rack::MethodOverride to properly log overridden methods
         "ActionDispatch::ShowExceptions",
         "ActionDispatch::RemoteIp",
         "Rack::Sendfile",
@@ -36,7 +37,6 @@ module ApplicationTests
         "ActionDispatch::Session::CookieStore",
         "ActionDispatch::Flash",
         "ActionDispatch::ParamsParser",
-        "Rack::MethodOverride",
         "ActionDispatch::Head",
         "Rack::ConditionalGet",
         "Rack::ETag",
diff --git a/railties/test/application/rack/logger_test.rb b/railties/test/application/rack/logger_test.rb
new file mode 100644
index 0000000000..a29244357c
--- /dev/null
+++ b/railties/test/application/rack/logger_test.rb
@@ -0,0 +1,40 @@
+require "isolation/abstract_unit"
+require "active_support/log_subscriber/test_helper"
+require "rack/test"
+
+module ApplicationTests
+  module RackTests
+    class LoggerTest < Test::Unit::TestCase
+      include ActiveSupport::LogSubscriber::TestHelper
+      include Rack::Test::Methods
+
+      def setup
+        build_app
+        require "#{app_path}/config/environment"
+        super
+      end
+
+      def logs
+        @logs ||= @logger.logged(:info)
+      end
+
+      test "logger logs proper HTTP verb and path" do
+        get "/blah"
+        wait
+        assert_match /^Started GET "\/blah"/, logs[0]
+      end
+
+      test "logger logs HTTP verb override" do
+        post "/", {:_method => 'put'}
+        wait
+        assert_match /^Started PUT "\/"/, logs[0]
+      end
+
+      test "logger logs HEAD requests" do
+        post "/", {:_method => 'head'}
+        wait
+        assert_match /^Started HEAD "\/"/, logs[0]
+      end
+    end
+  end
+end