* Change the object used in routing constraints to be an instance of

  ActionDispatch::Request rather than Rack::Request.

* Changed ActionDispatch::Request#method to return a String, to be
  compatible with the Rack::Request superclass.

* Changed ActionDispatch::Request#method to return the original
  method in the case of methodoverride and #request_method not to,
  to be compatible with Rack::Request

2 files changed, 2 insertions, 2 deletions

diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 1e2ee06adc..14c0c3708b 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -236,7 +236,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest
     end
 
     def method
-      render :text => "method: #{request.method}"
+      render :text => "method: #{request.method.downcase}"
     end
 
     def cookie_monster
diff --git a/actionpack/test/controller/verification_test.rb b/actionpack/test/controller/verification_test.rb
index 11d0d10897..0600ec2ec1 100644
--- a/actionpack/test/controller/verification_test.rb
+++ b/actionpack/test/controller/verification_test.rb
@@ -71,7 +71,7 @@ class VerificationTest < ActionController::TestCase
     end
 
     def guarded_by_method
-      render :text => "#{request.method}"
+      render :text => "#{request.method.downcase}"
     end
 
     def guarded_by_xhr