aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/integration.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-12-19 17:15:22 -0600
committerJoshua Peek <josh@joshpeek.com>2008-12-19 17:15:22 -0600
commitfda62ecf707b4023b30303dd0baf303f1ef8d344 (patch)
tree7329cd55304c2f5b092817171805fa7cf1088e97 /actionpack/lib/action_controller/integration.rb
parenta14bbd7a8574c3b485d4b71e0950b2b9ff4e90d7 (diff)
downloadrails-fda62ecf707b4023b30303dd0baf303f1ef8d344.tar.gz
rails-fda62ecf707b4023b30303dd0baf303f1ef8d344.tar.bz2
rails-fda62ecf707b4023b30303dd0baf303f1ef8d344.zip
Rename AbstractResponse to Response and inheirt from Rack::Response
Diffstat (limited to 'actionpack/lib/action_controller/integration.rb')
-rw-r--r--actionpack/lib/action_controller/integration.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb
index 8c2e3197df..d952c3489b 100644
--- a/actionpack/lib/action_controller/integration.rb
+++ b/actionpack/lib/action_controller/integration.rb
@@ -181,7 +181,7 @@ module ActionController
# - +headers+: Additional HTTP headers to pass, as a Hash. The keys will
# automatically be upcased, with the prefix 'HTTP_' added if needed.
#
- # This method returns an AbstractResponse object, which one can use to
+ # This method returns an Response object, which one can use to
# inspect the details of the response. Furthermore, if this method was
# called from an ActionController::IntegrationTest object, then that
# object's <tt>@response</tt> instance variable will point to the same
@@ -331,10 +331,10 @@ module ActionController
@response = @controller.response
else
# Decorate responses from Rack Middleware and Rails Metal
- # as an AbstractResponse for the purposes of integration testing
- @response = AbstractResponse.new
+ # as an Response for the purposes of integration testing
+ @response = Response.new
@response.status = status.to_s
- @response.headers = @headers
+ @response.headers.replace(@headers)
@response.body = @body
end