From 6f6c6b8bcb78169bcd6dd3aaa1c0410e7b36b567 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 25 Jun 2005 10:58:44 +0000 Subject: Updated assert_generates/routing to the new Routes code #1498 [Rick Olson] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1505 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/assertions.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/assertions.rb b/actionpack/lib/action_controller/assertions.rb index a419a65dfa..4a6f4daae5 100644 --- a/actionpack/lib/action_controller/assertions.rb +++ b/actionpack/lib/action_controller/assertions.rb @@ -94,6 +94,7 @@ module Test #:nodoc: # Asserts that the routing of the given path is handled correctly and that the parsed options match. def assert_recognizes(expected_options, path, extras={}, message=nil) + path = "/#{path}" unless path[0..0] == '/' # Load routes.rb if it hasn't been loaded. ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty? @@ -105,6 +106,7 @@ module Test #:nodoc: expected_options = expected_options.clone extras.each_key { |key| expected_options.delete key } unless extras.nil? + expected_options.stringify_keys! msg = build_message(message, "The recognized options did not match ", request.path_parameters, expected_options) assert_block(msg) { request.path_parameters == expected_options } @@ -121,7 +123,6 @@ module Test #:nodoc: request.path_parameters[:controller] ||= options[:controller] generated_path, found_extras = ActionController::Routing::Routes.generate(options, request) - generated_path = generated_path.join('/') msg = build_message(message, "found extras , not ", found_extras, extras) assert_block(msg) { found_extras == extras } -- cgit v1.2.3