aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/test_process.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-06-30 16:16:12 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-06-30 16:16:12 +0000
commit2455f96a6e33ab0d233fd98c7e3313131b4dbda2 (patch)
treec612f789d0a6b9982fec2b3598d6fc3088007e2d /actionpack/lib/action_controller/test_process.rb
parent524d1b5e044f8e104ac9b72290d832246c79bcd1 (diff)
downloadrails-2455f96a6e33ab0d233fd98c7e3313131b4dbda2.tar.gz
rails-2455f96a6e33ab0d233fd98c7e3313131b4dbda2.tar.bz2
rails-2455f96a6e33ab0d233fd98c7e3313131b4dbda2.zip
Fixed mr recycle!
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1574 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/test_process.rb')
-rw-r--r--actionpack/lib/action_controller/test_process.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb
index f1762e507f..71c012c357 100644
--- a/actionpack/lib/action_controller/test_process.rb
+++ b/actionpack/lib/action_controller/test_process.rb
@@ -249,6 +249,8 @@ module Test
private
# execute the request and set/volley the response
def process(action, parameters = nil, session = nil, flash = nil)
+ @request.recycle!
+
# Sanity check for required instance variables so we can give an understandable error message.
%w(controller request response).each do |iv_name|
assert_not_nil instance_variable_get("@#{iv_name}"), "@#{iv_name} is nil: make sure you set it in your test's setup method."
@@ -265,7 +267,6 @@ module Test
@request.session["flash"] = ActionController::Flash::FlashHash.new.update(flash) if flash
build_request_uri(action, parameters)
@controller.process(@request, @response)
- # @request.recycle!
end
# execute the request simulating a specific http method and set/volley the response