From 3c5bd78ddbeefe7b1d1b513d9057bd9358d5a5da Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 10 Jul 2015 11:52:51 -0700 Subject: we don't really need an extra method to set the script name --- actionpack/lib/action_controller/test_case.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'actionpack/lib') 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? -- cgit v1.2.3