aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/testing
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2017-07-02 13:50:25 -0700
committerGitHub <noreply@github.com>2017-07-02 13:50:25 -0700
commit92c29d82eb2f323bb1338a039229a66057a7d137 (patch)
tree050eea5a719faa416b64b804617f8755b6500e09 /actionpack/lib/action_dispatch/testing
parentf851e1f705f26d8f92f0fc1b265b20bc389d23cb (diff)
parentf443460670576cd82a806a851b7124479e8325c9 (diff)
downloadrails-92c29d82eb2f323bb1338a039229a66057a7d137.tar.gz
rails-92c29d82eb2f323bb1338a039229a66057a7d137.tar.bz2
rails-92c29d82eb2f323bb1338a039229a66057a7d137.zip
Merge branch 'master' into require_relative_2017
Diffstat (limited to 'actionpack/lib/action_dispatch/testing')
-rw-r--r--actionpack/lib/action_dispatch/testing/assertions/response.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/response.rb b/actionpack/lib/action_dispatch/testing/assertions/response.rb
index 1baf979ac9..749f2eab57 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/response.rb
@@ -79,7 +79,7 @@ module ActionDispatch
def generate_response_message(expected, actual = @response.response_code)
"Expected response to be a <#{code_with_name(expected)}>,"\
" but was a <#{code_with_name(actual)}>"
- .concat(location_if_redirected).concat(response_body_if_short)
+ .dup.concat(location_if_redirected).concat(response_body_if_short)
end
def response_body_if_short