diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-07-10 11:49:18 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-07-10 14:19:11 -0700 |
| commit | 8b4eca09a5c321afd93211043b24aa6840837fd8 (patch) | |
| tree | c6fcb5c5f32f5b27dd1700f43cfa70d647a4c997 /actionpack/lib/action_controller/test_case.rb | |
| parent | 889a4a3da025e52d0f044d9b1b832a45fcc88c01 (diff) | |
| download | rails-8b4eca09a5c321afd93211043b24aa6840837fd8.tar.gz rails-8b4eca09a5c321afd93211043b24aa6840837fd8.tar.bz2 rails-8b4eca09a5c321afd93211043b24aa6840837fd8.zip | |
always default the SCRIPT_NAME to whatever is on the controller
Diffstat (limited to 'actionpack/lib/action_controller/test_case.rb')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index d92d18933a..6495e549e0 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -641,9 +641,9 @@ module ActionController url, = @routes.path_for(options).split("?", 2) - @request.env["SCRIPT_NAME"] = @controller.config.relative_url_root @request.env["PATH_INFO"] = url end + @request.env["SCRIPT_NAME"] ||= @controller.config.relative_url_root end def html_format?(parameters) |