diff options
| author | kp <keith.j.payne@gmail.com> | 2016-02-10 17:44:54 +0000 |
|---|---|---|
| committer | kp <keith.j.payne@gmail.com> | 2016-02-10 17:44:54 +0000 |
| commit | ec4ae308a76bd86fb6eaf7fa8ee025af0063ee30 (patch) | |
| tree | 741019b3fbf474ff4cdeefdbeb6ff1f598ffcdfc /actionpack/lib/action_dispatch/testing/assertions | |
| parent | 8641de93eb98d4ebdb0db2530c8c79c0c4e2f95e (diff) | |
| parent | 688996da7b25080a1a2ef74f5b4789f3e5eb670d (diff) | |
| download | rails-ec4ae308a76bd86fb6eaf7fa8ee025af0063ee30.tar.gz rails-ec4ae308a76bd86fb6eaf7fa8ee025af0063ee30.tar.bz2 rails-ec4ae308a76bd86fb6eaf7fa8ee025af0063ee30.zip | |
Merge remote-tracking branch 'origin/master' into actioncable_logging
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/assertions')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions/routing.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb index 78ef860548..e7af27463c 100644 --- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb +++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb @@ -86,6 +86,7 @@ module ActionDispatch end # Load routes.rb if it hasn't been loaded. + options = options.clone generated_path, query_string_keys = @routes.generate_extras(options, defaults) found_extras = options.reject { |k, _| ! query_string_keys.include? k } |