diff options
| author | Jamis Buck <jamis@37signals.com> | 2006-10-16 14:32:11 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2006-10-16 14:32:11 +0000 |
| commit | b5ec0fe3133531f0cce5b8707f2ac831fdc57bea (patch) | |
| tree | dc0d09fe7a589ad5172ff5817a0a2a35b5cfe356 /actionpack/lib/action_controller | |
| parent | 497b5dcf1965dea95bc59a00214e14c42dba69cc (diff) | |
| download | rails-b5ec0fe3133531f0cce5b8707f2ac831fdc57bea.tar.gz rails-b5ec0fe3133531f0cce5b8707f2ac831fdc57bea.tar.bz2 rails-b5ec0fe3133531f0cce5b8707f2ac831fdc57bea.zip | |
Fix broken assert_generates when extra keys are being checked.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5309 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -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 2ecf1b9e8e..54a6dfc5a7 100644 --- a/actionpack/lib/action_controller/assertions/routing_assertions.rb +++ b/actionpack/lib/action_controller/assertions/routing_assertions.rb @@ -40,7 +40,7 @@ module ActionController # Load routes.rb if it hasn't been loaded. ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty? - generated_path, extra_keys = ActionController::Routing::Routes.generate_extras(options, extras) + generated_path, extra_keys = ActionController::Routing::Routes.generate_extras(options, defaults) found_extras = options.reject {|k, v| ! extra_keys.include? k} msg = build_message(message, "found extras <?>, not <?>", found_extras, extras) |