aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authoreileencodes <eileencodes@gmail.com>2015-08-08 10:23:07 -0400
committereileencodes <eileencodes@gmail.com>2015-08-08 10:29:34 -0400
commite7dd9069ca24d29f1c781d940c4b22083e111c86 (patch)
treecc77d256a6d618e15632e0452a4a5467924f3c2c /actionpack/lib/action_controller
parentc8b82955836cfff2795464e8acc7592e3c192a51 (diff)
downloadrails-e7dd9069ca24d29f1c781d940c4b22083e111c86.tar.gz
rails-e7dd9069ca24d29f1c781d940c4b22083e111c86.tar.bz2
rails-e7dd9069ca24d29f1c781d940c4b22083e111c86.zip
Rename `extra_keys` variables to `query_string_keys`
`extra_keys` is a confusing variable name because it's not clear what is "extra". This renames it to `query_string_keys` so it's clear that the "extra" is just the query string.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/test_case.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 9dab72c5f0..39069f7378 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -44,12 +44,12 @@ module ActionController
def assign_parameters(routes, controller_path, action, parameters = {})
parameters = parameters.symbolize_keys
- generated_path, extra_keys = routes.generate_extras(parameters.merge(:controller => controller_path, :action => action))
+ generated_path, query_string_keys = routes.generate_extras(parameters.merge(:controller => controller_path, :action => action))
non_path_parameters = {}
path_parameters = {}
parameters.each do |key, value|
- if extra_keys.include?(key) || key == :action || key == :controller
+ if query_string_keys.include?(key) || key == :action || key == :controller
non_path_parameters[key] = value
else
if value.is_a?(Array)