aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-06-30 14:49:36 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-06-30 14:49:36 +0000
commit524d1b5e044f8e104ac9b72290d832246c79bcd1 (patch)
tree9422c3ab06f6ed8b6c6ae2a11fbb1ba56aa9dcbf /actionpack/lib/action_controller
parent4cd5b05377c057ea44401dc759d641c5738540ce (diff)
downloadrails-524d1b5e044f8e104ac9b72290d832246c79bcd1.tar.gz
rails-524d1b5e044f8e104ac9b72290d832246c79bcd1.tar.bz2
rails-524d1b5e044f8e104ac9b72290d832246c79bcd1.zip
Uncommented request.recycle! as it breaks more than it fixes, left test case in, xal?
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1572 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/test_process.rb19
1 files changed, 14 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb
index 1092a860c9..f1762e507f 100644
--- a/actionpack/lib/action_controller/test_process.rb
+++ b/actionpack/lib/action_controller/test_process.rb
@@ -31,8 +31,8 @@ module ActionController #:nodoc:
def reset_session
@session = {}
- end
-
+ end
+
def port=(number)
@env["SERVER_PORT"] = number.to_i
end
@@ -72,11 +72,19 @@ module ActionController #:nodoc:
extra_keys = ActionController::Routing::Routes.extra_keys(parameters)
non_path_parameters = get? ? query_parameters : request_parameters
parameters.each do |key, value|
- if extra_keys.include?(key.to_sym) then non_path_parameters[key] = value
- else path_parameters[key] = value.to_s
+ if extra_keys.include?(key.to_sym)
+ non_path_parameters[key] = value
+ else
+ path_parameters[key] = value.to_s
end
end
- end
+ end
+
+ def recycle!
+ self.request_parameters = {}
+ self.query_parameters = {}
+ self.path_parameters = {}
+ end
private
def initialize_containers
@@ -257,6 +265,7 @@ 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