diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-07-10 11:51:14 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-07-10 14:19:11 -0700 |
commit | e459b29fb4117dac66be241e1ddb9fa9ce67594c (patch) | |
tree | 36775624e2c8d94cb0047a6587a0c2d5998c7d28 /actionpack | |
parent | 8b4eca09a5c321afd93211043b24aa6840837fd8 (diff) | |
download | rails-e459b29fb4117dac66be241e1ddb9fa9ce67594c.tar.gz rails-e459b29fb4117dac66be241e1ddb9fa9ce67594c.tar.bz2 rails-e459b29fb4117dac66be241e1ddb9fa9ce67594c.zip |
default `PATH_INFO` to the generated path
we were already generating a path in the previous code (it was just not
returned), so lets just use the already computed path to popluate the
PATH_INFO header
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 6495e549e0..26ddd895b7 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -44,7 +44,7 @@ module ActionController def assign_parameters(routes, controller_path, action, parameters = {}) parameters = parameters.symbolize_keys - extra_keys = routes.extra_keys(parameters.merge(:controller => controller_path, :action => action)) + generated_path, extra_keys = routes.generate_extras(parameters.merge(:controller => controller_path, :action => action)) non_path_parameters = {} path_parameters = {} @@ -97,6 +97,7 @@ module ActionController @env['rack.input'] = StringIO.new(data) end + @env["PATH_INFO"] ||= generated_path path_parameters[:controller] = controller_path path_parameters[:action] = action |