From 5e3b8b36fa1524bd9b0c66af07732f8950ccf38e Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 17 Apr 2005 06:18:33 +0000 Subject: [PATCH] Fixed url_for(nil) in functional tests #1116 [Alisdair McDiarmid] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1175 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/CHANGELOG | 2 ++ actionpack/lib/action_controller/test_process.rb | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 70bf24c414a8..f28143ffa836 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed url_for(nil) in functional tests #1116 [Alisdair McDiarmid] + * Fixed error handling of broken layouts #1115 [Michael Schubert] * Changed render_partial to take local assigns as the second parameter instead of an explicit object and then the assigns. So the API changes from: diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb index 3aa9ffe05591..6931e7cdcb5f 100644 --- a/actionpack/lib/action_controller/test_process.rb +++ b/actionpack/lib/action_controller/test_process.rb @@ -254,7 +254,8 @@ class TestCase #:nodoc: def process(action, parameters = nil, session = nil, flash = nil) @request.env['REQUEST_METHOD'] ||= "GET" @request.action = action.to_s - @request.path_parameters = { :controller => @controller.class.controller_path } + @request.path_parameters = { :controller => @controller.class.controller_path, + :action => action.to_s } @request.parameters.update(parameters) unless parameters.nil? @request.session = ActionController::TestSession.new(session) unless session.nil? @request.session["flash"] = ActionController::Flash::FlashHash.new.update(flash) if flash