A hopefully more successful attempt at the Routing branch merge

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@617 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 31 insertions, 1 deletions

diff --git a/actionpack/lib/action_controller/assertions/action_pack_assertions.rb b/actionpack/lib/action_controller/assertions/action_pack_assertions.rb
index c26941cd6b..a8819550e6 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,6 +158,36 @@ 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.clone
+        
+        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(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