diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-07-10 11:52:51 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-07-10 14:19:11 -0700 |
| commit | 3c5bd78ddbeefe7b1d1b513d9057bd9358d5a5da (patch) | |
| tree | a469ebd30ef1756cbf3ce6c012e9a9ec5f352d2c /actionpack | |
| parent | 85903d1b08963c1ac872106c3c727ff5468559a2 (diff) | |
| download | rails-3c5bd78ddbeefe7b1d1b513d9057bd9358d5a5da.tar.gz rails-3c5bd78ddbeefe7b1d1b513d9057bd9358d5a5da.tar.bz2 rails-3c5bd78ddbeefe7b1d1b513d9057bd9358d5a5da.zip | |
we don't really need an extra method to set the script name
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 6965794657..43c481339a 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -506,7 +506,7 @@ module ActionController @controller.request = @request @controller.response = @response - build_request_uri(controller_class_name, action, parameters) + @request.env["SCRIPT_NAME"] ||= @controller.config.relative_url_root @controller.recycle! @controller.process(action) @@ -631,10 +631,6 @@ module ActionController end end - def build_request_uri(controller_class_name, action, parameters) - @request.env["SCRIPT_NAME"] ||= @controller.config.relative_url_root - end - def html_format?(parameters) return true unless parameters.key?(:format) Mime.fetch(parameters[:format]) { Mime['html'] }.html? |