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
This commit is contained in:
David Heinemeier Hansson 2005-06-30 14:49:36 +00:00
parent 4cd5b05377
commit 524d1b5e04
5 changed files with 29 additions and 9 deletions

View File

@ -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

View File

@ -8,8 +8,8 @@ class TestTest < Test::Unit::TestCase
def test_params
render :text => params.inspect
end
end
def test_uri
render :text => request.request_uri
end
@ -33,6 +33,10 @@ class TestTest < Test::Unit::TestCase
</html>
HTML
end
def test_only_one_param
render :text => (@params[:left] && @params[:right]) ? "EEP, Both here!" : "OK"
end
end
def setup
@ -49,8 +53,8 @@ HTML
def test_process_without_flash
process :set_flash
assert_flash_equal "><", "test"
end
end
def test_process_with_flash
process :set_flash, nil, nil, { "test" => "value" }
assert_flash_equal ">value<", "test"
@ -70,6 +74,13 @@ HTML
@request.set_REQUEST_URI "/explicit/uri"
process :test_uri, :id => 7
assert_equal "/explicit/uri", @response.body
end
def test_multiple_calls
process :test_only_one_param, :left => true
assert_equal "OK", @response.body
process :test_only_one_param, :right => true
assert_equal "OK", @response.body
end
def test_assert_tag