From 88a3343ed57c01ca358da8473d15fc4d2b4a5bff Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 15 Feb 2005 01:24:55 +0000 Subject: Backed out of routing merge.. investigating missing patches git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@616 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../assertions/action_pack_assertions.rb | 32 +--------------------- 1 file changed, 1 insertion(+), 31 deletions(-) (limited to 'actionpack/lib/action_controller/assertions') diff --git a/actionpack/lib/action_controller/assertions/action_pack_assertions.rb b/actionpack/lib/action_controller/assertions/action_pack_assertions.rb index 7d27240244..c26941cd6b 100644 --- a/actionpack/lib/action_controller/assertions/action_pack_assertions.rb +++ b/actionpack/lib/action_controller/assertions/action_pack_assertions.rb @@ -141,7 +141,7 @@ module Test #:nodoc: end end end - + # ensure our redirection url is an exact match def assert_redirect_url(url=nil, message=nil) assert_redirect(message) @@ -158,36 +158,6 @@ module Test #:nodoc: assert_block(msg) { response.redirect_url_match?(pattern) } end - # -- routing assertions -------------------------------------------------- - - # Asserts that the routing of the given path is handled correctly and that the parsed options match. - # Also verifies that the provided options can be used to generate the provided path. - def assert_routing(path, options, defaults={}, extras={}, message=nil) - defaults[:controller] ||= options[:controller] # Assume given controller, - request = ActionController::TestRequest.new({}, {}, nil) - request.path_parameters = defaults - - ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty? # Load routes.rb if it hasn't been loaded. - - generated_path, found_extras = ActionController::Routing::Routes.generate(defaults.merge(options), request) - generated_path = generated_path.join('/') - msg = build_message(message, "found extras , not ", found_extras, extras) - assert_block(msg) { found_extras == extras } - - msg = build_message(message, "The generated path did not match ", generated_path, path) - assert_block(msg) { path == generated_path } - - request = ActionController::TestRequest.new({}, {}, nil) - request.path = path - ActionController::Routing::Routes.recognize!(request) - - expected_options = options.clone - extras.each {|k,v| expected_options.delete k} - - msg = build_message(message, "The recognized options did not match ", request.path_parameters, expected_options) - assert_block(msg) { request.path_parameters == expected_options } - end - # -- template assertions ------------------------------------------------ # ensure that a template object with the given name exists -- cgit v1.2.3