diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-06-25 11:01:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-25 11:01:58 +0200 |
commit | 17c1c9f1cb84fef35f10e0a9bd52df9b5b340901 (patch) | |
tree | eb2ea5b3ade5947a486b39bcc53cedbde334cc03 /actionpack/lib/action_dispatch/testing/integration.rb | |
parent | 3a9428df91ccde20574a3c9a56f6e71945fe2ef2 (diff) | |
parent | e130ce456290f1efd39118419ca0783da0677ff1 (diff) | |
download | rails-17c1c9f1cb84fef35f10e0a9bd52df9b5b340901.tar.gz rails-17c1c9f1cb84fef35f10e0a9bd52df9b5b340901.tar.bz2 rails-17c1c9f1cb84fef35f10e0a9bd52df9b5b340901.zip |
Merge pull request #25435 from y-yagi/make_as_option_work_with_get_parameters
make `as` option work with get parameters
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/integration.rb')
-rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 8777666f9f..4f21403a90 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -336,8 +336,10 @@ module ActionDispatch end path = request_encoder.append_format_to location.path path = location.query ? "#{path}?#{location.query}" : path - else - path = request_encoder.append_format_to path + elsif !as.nil? + location = URI.parse(path) + path = request_encoder.append_format_to location.path + path = location.query ? "#{path}?#{location.query}" : path end hostname, port = host.split(':') |