提交 4f2cd3e9 编写于 作者: A Aaron Patterson

group things that are alike

上级 9f4dafb8
...@@ -17,6 +17,9 @@ def set_response!(request) ...@@ -17,6 +17,9 @@ def set_response!(request)
def recycle! def recycle!
@_url_options = nil @_url_options = nil
self.response_body = nil
self.formats = nil
self.params = nil
end end
end end
......
...@@ -467,11 +467,14 @@ def process(action, http_method = 'GET', *args) ...@@ -467,11 +467,14 @@ def process(action, http_method = 'GET', *args)
# proper params, as is the case when engaging rack. # proper params, as is the case when engaging rack.
parameters = paramify_values(parameters) if html_format?(parameters) parameters = paramify_values(parameters) if html_format?(parameters)
unless @controller.respond_to?(:recycle!)
@controller.extend(Testing::Functional)
@controller.class.class_eval { include Testing }
end
@request.recycle! @request.recycle!
@response.recycle! @response.recycle!
@controller.response_body = nil @controller.recycle!
@controller.formats = nil
@controller.params = nil
@html_document = nil @html_document = nil
@request.env['REQUEST_METHOD'] = http_method @request.env['REQUEST_METHOD'] = http_method
...@@ -492,12 +495,6 @@ def process(action, http_method = 'GET', *args) ...@@ -492,12 +495,6 @@ def process(action, http_method = 'GET', *args)
build_request_uri(action, parameters) build_request_uri(action, parameters)
unless @controller.respond_to?(:recycle!)
@controller.extend(Testing::Functional)
@controller.class.class_eval { include Testing }
end
@controller.recycle!
name = @request.parameters[:action] name = @request.parameters[:action]
@controller.process(name) @controller.process(name)
...@@ -535,7 +532,7 @@ def setup_controller_request_and_response ...@@ -535,7 +532,7 @@ def setup_controller_request_and_response
setup :setup_controller_request_and_response setup :setup_controller_request_and_response
end end
private private
def check_required_ivars def check_required_ivars
# Sanity check for required instance variables so we can give an # Sanity check for required instance variables so we can give an
# understandable error message. # understandable error message.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册