aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2016-07-01 22:22:10 +0200
committerGitHub <noreply@github.com>2016-07-01 22:22:10 +0200
commit7f0d415eb7ea058d70ffb9e77510727f4bbd2c7e (patch)
tree037f4f4de12e80110ed91d834e0f6817e764b5d9 /actionpack/lib/action_dispatch
parentd7a7a2561a6e10f2c82ab06202c88638ca213c6c (diff)
parentfa10787447162c662e72b653f1d114834efddfb5 (diff)
downloadrails-7f0d415eb7ea058d70ffb9e77510727f4bbd2c7e.tar.gz
rails-7f0d415eb7ea058d70ffb9e77510727f4bbd2c7e.tar.bz2
rails-7f0d415eb7ea058d70ffb9e77510727f4bbd2c7e.zip
Merge pull request #25632 from volmer/fix-integration-test-frozen-literals
Fix request encoding in tests when string literals are frozen
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/testing/integration.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 5627e79bb7..ecd02b8c2e 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -423,7 +423,7 @@ module ActionDispatch
end
def append_format_to(path)
- path << @path_format unless @url_encoded_form
+ path += @path_format unless @url_encoded_form
path
end