diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-24 17:07:48 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-24 17:07:48 -0700 |
| commit | c82248ea8647619cafe47d16945a45fcbf8196ef (patch) | |
| tree | 6b64c48994cde729b2ed3044fd7b35b3ed519c5d /actionpack | |
| parent | d4e1f58fd8ce70ae356c630dad68926ad6711fe3 (diff) | |
| download | rails-c82248ea8647619cafe47d16945a45fcbf8196ef.tar.gz rails-c82248ea8647619cafe47d16945a45fcbf8196ef.tar.bz2 rails-c82248ea8647619cafe47d16945a45fcbf8196ef.zip | |
remove more direct `env` mutations
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 4 | ||||
| -rw-r--r-- | actionpack/test/controller/test_case_test.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 9ac2339789..103986e44a 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -98,7 +98,9 @@ module ActionController set_header 'rack.input', StringIO.new(data) end - @env["PATH_INFO"] ||= generated_path + get_header("PATH_INFO") do |k| + set_header k, generated_path + end path_parameters[:controller] = controller_path path_parameters[:action] = action diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb index 1f073b4124..b3c3979c84 100644 --- a/actionpack/test/controller/test_case_test.rb +++ b/actionpack/test/controller/test_case_test.rb @@ -160,7 +160,7 @@ XML def setup super @controller = TestController.new - @request.env['PATH_INFO'] = nil + @request.delete_header 'PATH_INFO' @routes = ActionDispatch::Routing::RouteSet.new.tap do |r| r.draw do get ':controller(/:action(/:id))' |