diff options
| author | José Valim <jose.valim@gmail.com> | 2009-12-11 19:24:32 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-12-11 19:24:32 -0200 |
| commit | cf7b94c013d4e824433a018001474e71ddd81a99 (patch) | |
| tree | 67b90f1e13a88d60170469e281f081711a976194 /actionpack/lib/action_dispatch/testing/assertions | |
| parent | 6e55b32e98fcaad82184d2e21ee611a3465e4b20 (diff) | |
| parent | 2297eaed5b195ea42b99d062ad45f87dde9d3c60 (diff) | |
| download | rails-cf7b94c013d4e824433a018001474e71ddd81a99.tar.gz rails-cf7b94c013d4e824433a018001474e71ddd81a99.tar.bz2 rails-cf7b94c013d4e824433a018001474e71ddd81a99.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/assertions')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions/routing.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb index e6d6b5a3ef..4bc5275e04 100644 --- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb +++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb @@ -134,9 +134,11 @@ module ActionDispatch # Assume given controller request = ActionController::TestRequest.new request.env["REQUEST_METHOD"] = request_method.to_s.upcase if request_method - request.path = path + request.path = path + + params = ActionController::Routing::Routes.recognize_path(path, { :method => request.method }) + request.path_parameters = params.with_indifferent_access - ActionController::Routing::Routes.recognize(request) request end end |