Changeset 1505

Timestamp:

06/25/05 10:58:44 (3 years ago)

Author:

david

Message:

Updated assert_generates/routing to the new Routes code #1498 [Rick Olson]

Files:

• trunk/actionpack/lib/action_controller/assertions.rb (modified) (3 diffs)
• trunk/actionpack/test/controller/test_test.rb (modified) (1 diff)

trunk/actionpack/lib/action_controller/assertions.rb

@@ -95 +95 @@
-      # 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? 
@@ -106 +107 @@
-        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)
@@ -122 +124 @@
-      
-        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 }

trunk/actionpack/test/controller/test_test.rb

@@ -85 +85 @@
-                                   :only => { :tag => "li" } } }
-  end
+
+  def test_assert_routing
+    assert_generates 'controller/action/5', :controller => 'controller', :action => 'action', :id => '5'
+  end
-end