aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/testing/integration.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-04-26 11:12:33 -0500
committerJoshua Peek <josh@joshpeek.com>2009-04-26 11:12:33 -0500
commit5352a2417b9f6297d16a6baefd1994be4d1e4a12 (patch)
tree38c734e7005d3ac5c28fd72cee2c04ef1801c944 /actionpack/lib/action_controller/testing/integration.rb
parentdbbe2e74ff5b6363da74fe63045b043c24041b1a (diff)
downloadrails-5352a2417b9f6297d16a6baefd1994be4d1e4a12.tar.gz
rails-5352a2417b9f6297d16a6baefd1994be4d1e4a12.tar.bz2
rails-5352a2417b9f6297d16a6baefd1994be4d1e4a12.zip
Move useful response test helpers into request
Diffstat (limited to 'actionpack/lib/action_controller/testing/integration.rb')
-rw-r--r--actionpack/lib/action_controller/testing/integration.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/testing/integration.rb b/actionpack/lib/action_controller/testing/integration.rb
index 15d0603ac1..10260d5af2 100644
--- a/actionpack/lib/action_controller/testing/integration.rb
+++ b/actionpack/lib/action_controller/testing/integration.rb
@@ -304,8 +304,11 @@ module ActionController
@response = @controller.response
@controller.send(:set_test_assigns)
else
- @request = ::Rack::Request.new(env)
- @response = response
+ @request = Request.new(env)
+ @response = Response.new
+ @response.status = @status
+ @response.headers = @headers
+ @response.body = @body
end
# Decorate the response with the standard behavior of the