aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-07-10 11:51:53 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-07-10 14:19:11 -0700
commit85903d1b08963c1ac872106c3c727ff5468559a2 (patch)
treefec7349fb7bc21c4922b1335a5ebcf4b128efe41
parente459b29fb4117dac66be241e1ddb9fa9ce67594c (diff)
downloadrails-85903d1b08963c1ac872106c3c727ff5468559a2.tar.gz
rails-85903d1b08963c1ac872106c3c727ff5468559a2.tar.bz2
rails-85903d1b08963c1ac872106c3c727ff5468559a2.zip
Remove useless conditional
PATH_INFO is already set, so this branch will never execute.
-rw-r--r--actionpack/lib/action_controller/test_case.rb12
1 files changed, 0 insertions, 12 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 26ddd895b7..6965794657 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -632,18 +632,6 @@ module ActionController
end
def build_request_uri(controller_class_name, action, parameters)
- unless @request.env["PATH_INFO"]
- options = @controller.respond_to?(:url_options) ? @controller.__send__(:url_options).merge(parameters) : parameters
- options.update(
- :controller => controller_class_name,
- :action => action,
- :relative_url_root => nil,
- :_recall => @request.path_parameters)
-
- url, = @routes.path_for(options).split("?", 2)
-
- @request.env["PATH_INFO"] = url
- end
@request.env["SCRIPT_NAME"] ||= @controller.config.relative_url_root
end