Changeset 8836

Timestamp:

02/10/08 01:09:07 (6 months ago)

Author:

nzkoz

Message:

2-0-stable: Make assert_routing aware of the HTTP method used. References #8039 [mpalmer]

Merging [8748]

Files:

• branches/2-0-stable/actionpack/lib/action_controller/assertions/routing_assertions.rb (modified) (2 diffs)
• branches/2-0-stable/actionpack/test/controller/test_test.rb (modified) (1 diff)
• branches/2-0-stable/activerecord/CHANGELOG (modified) (1 diff)

branches/2-0-stable/actionpack/lib/action_controller/assertions/routing_assertions.rb

@@ -115 +115 @@
-      #  # Tests a route, providing a defaults hash
-      #  assert_routing 'controller/action/9', {:id => "9", :item => "square"}, {:controller => "controller", :action => "action"}, {}, {:item => "square"}
+      #
+      #  # Tests a route with a HTTP method
+      #  assert_routing({ :method => 'put', :path => '/product/321' }, { :controller => "product", :action => "update", :id => "321" })
-      def assert_routing(path, options, defaults={}, extras={}, message=nil)
-        assert_recognizes(options, path, extras, message)
@@ -123 +126 @@
-        end
-         
-
+.is_a?(Hash) ? path[:path] : path
-      end
-

branches/2-0-stable/actionpack/test/controller/test_test.rb

@@ -402 +402 @@
-  end
-
+  def test_assert_routing_with_method
+    with_routing do |set|
+        set.draw { |map| map.resources(:content) }
+      assert_routing({ :method => 'post', :path => 'content' }, { :controller => 'content', :action => 'create' })
+    end
+  end
+
-  def test_assert_routing_in_module
-    assert_routing 'admin/user', :controller => 'admin/user', :action => 'index'

branches/2-0-stable/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Make assert_routing aware of the HTTP method used.  #8039 [mpalmer]
+   e.g. assert_routing({ :method => 'put', :path => '/product/321' }, { :controller => "product", :action => "update", :id => "321" })
+
-
-* Ensure that modifying has_and_belongs_to_many actions clear the query cache.  Closes #10840 [john.andrews]