aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/test_case.rb6
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?