From f14bda6db0bdc6b3204825d7ad88c946be63a770 Mon Sep 17 00:00:00 2001 From: Raul Murciano Date: Fri, 25 Jul 2008 13:28:57 +0200 Subject: [PATCH] Removed flash argument on xhr integration calls --- actionpack/lib/action_controller/test_process.rb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb index 721592b..75cba83 100644 --- a/actionpack/lib/action_controller/test_process.rb +++ b/actionpack/lib/action_controller/test_process.rb @@ -383,10 +383,10 @@ module ActionController #:nodoc: @controller.process(@request, @response) end - def xml_http_request(request_method, action, parameters = nil, session = nil, flash = nil) + def xml_http_request(request_method, action, parameters = nil, session = nil) @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest' @request.env['HTTP_ACCEPT'] = 'text/javascript, text/html, application/xml, text/xml, */*' - returning send!(request_method, action, parameters, session, flash) do + returning send!(request_method, action, parameters, session) do @request.env.delete 'HTTP_X_REQUESTED_WITH' @request.env.delete 'HTTP_ACCEPT' end -- 1.5.4.5