aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/testing
diff options
context:
space:
mode:
authoreileencodes <eileencodes@gmail.com>2015-12-01 14:28:01 -0500
committereileencodes <eileencodes@gmail.com>2015-12-06 15:32:40 -0500
commit492b134433653cbbea1b30c459d41054f0da5ad7 (patch)
tree9a68120674fba48c25bee94d137b586da635841b /actionpack/lib/action_dispatch/testing
parenta246a69e92a8ed54eb569a662dbaba16d743b2b7 (diff)
downloadrails-492b134433653cbbea1b30c459d41054f0da5ad7.tar.gz
rails-492b134433653cbbea1b30c459d41054f0da5ad7.tar.bz2
rails-492b134433653cbbea1b30c459d41054f0da5ad7.zip
Push `before_sending` to super class
We want to get rid of the `Live::Response` so we are consolidating methods from `Live::Response` and `Response` by merging them together. This adds an `#empty` method to the request so we don't need to hard-code the empty array each time we call an empty `ActionDispatch::Request`. The work here is a continuation on combining controller and integration test code bases into one.
Diffstat (limited to 'actionpack/lib/action_dispatch/testing')
-rw-r--r--actionpack/lib/action_dispatch/testing/integration.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 790f9ea5d2..711ca10419 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -375,6 +375,7 @@ module ActionDispatch
@request = ActionDispatch::Request.new(session.last_request.env)
response = _mock_session.last_response
@response = ActionDispatch::TestResponse.from_response(response)
+ @response.request = @request
@html_document = nil
@url_options = nil