From c0771fe7d8f8a4fb9e86fba40d096b6f04f34e7d Mon Sep 17 00:00:00 2001 From: Nicholas Seckar Date: Fri, 15 Jul 2005 15:00:39 +0000 Subject: Fix assert_routing with nested controllers. Closes #1582 and #1386. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1837 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/assertions.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/assertions.rb b/actionpack/lib/action_controller/assertions.rb index e04d4ccde0..20650c8654 100644 --- a/actionpack/lib/action_controller/assertions.rb +++ b/actionpack/lib/action_controller/assertions.rb @@ -138,12 +138,7 @@ module Test #:nodoc: # Load routes.rb if it hasn't been loaded. ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty? - # Assume given controller - request = ActionController::TestRequest.new({}, {}, nil) - request.path_parameters = (defaults or {}).clone - request.path_parameters[:controller] ||= options[:controller] - - generated_path, found_extras = ActionController::Routing::Routes.generate(options, request) + generated_path, found_extras = ActionController::Routing::Routes.generate(options, extras) msg = build_message(message, "found extras , not ", found_extras, extras) assert_block(msg) { found_extras == extras } @@ -156,6 +151,12 @@ module Test #:nodoc: # options is same as path, and also that the options recognized from path are same as options def assert_routing(path, options, defaults={}, extras={}, message=nil) assert_recognizes(options, path, extras, message) + + controller, default_controller = options[:controller], defaults[:controller] + if controller && controller.include?(?/) && default_controller && default_controller.include?(?/) + options[:controller] = "/#{controller}" + end + assert_generates(path, options, defaults, extras, message) end -- cgit v1.2.3