diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-12-26 17:18:06 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-12-26 17:18:06 +0000 |
| commit | 73e9f4e9096515e9f4d97baaa914320c42159985 (patch) | |
| tree | db8fc9b9c07ca9a523a764ad76ce3b75254c73b3 /actionpack/lib/action_controller/assertions/routing_assertions.rb | |
| parent | 2cd8d3b4c5b2a90da52bfe2e92455fdecfb89ac2 (diff) | |
| parent | 07298fd0929ae1c6dd6d1b41bf320112d6bfc6a0 (diff) | |
| download | rails-73e9f4e9096515e9f4d97baaa914320c42159985.tar.gz rails-73e9f4e9096515e9f4d97baaa914320c42159985.tar.bz2 rails-73e9f4e9096515e9f4d97baaa914320c42159985.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/assertions/routing_assertions.rb')
| -rw-r--r-- | actionpack/lib/action_controller/assertions/routing_assertions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/assertions/routing_assertions.rb b/actionpack/lib/action_controller/assertions/routing_assertions.rb index 8a837c592c..5101751cea 100644 --- a/actionpack/lib/action_controller/assertions/routing_assertions.rb +++ b/actionpack/lib/action_controller/assertions/routing_assertions.rb @@ -134,7 +134,7 @@ module ActionController path = "/#{path}" unless path.first == '/' # Assume given controller - request = ActionController::TestRequest.new({}, {}, nil) + request = ActionController::TestRequest.new request.env["REQUEST_METHOD"] = request_method.to_s.upcase if request_method request.path = path |