diff options
| author | Jeremy Kemper <jeremykemper@gmail.com> | 2015-02-24 17:28:45 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremykemper@gmail.com> | 2015-02-25 09:49:25 -0700 |
| commit | f6e293ec54f02f83cdb37502bea117f66f87bcae (patch) | |
| tree | bf2d9a7d1de683860700a1c11ca0594bd304fc1e /actionpack/lib/action_dispatch/testing/integration.rb | |
| parent | 2abed7af6e4b87da7277952e9ad73681ac337f2e (diff) | |
| download | rails-f6e293ec54f02f83cdb37502bea117f66f87bcae.tar.gz rails-f6e293ec54f02f83cdb37502bea117f66f87bcae.tar.bz2 rails-f6e293ec54f02f83cdb37502bea117f66f87bcae.zip | |
Fix default headers in test responses
Fixes regression in #18423. Merge default headers for new responses,
but don't merge when creating a response from the last session request.
hat tip @senny :heart:
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/integration.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 2 |
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 9b00616968..2fe37c5bd4 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -369,7 +369,7 @@ module ActionDispatch @request_count += 1 @request = ActionDispatch::Request.new(session.last_request.env) response = _mock_session.last_response - @response = ActionDispatch::TestResponse.new(response.status, response.headers, response.body) + @response = ActionDispatch::TestResponse.from_response(response) @html_document = nil @url_options = nil |