0
@@ -114,6 +114,9 @@ module ActionController
0
       #
0
       #  # Tests a route, providing a defaults hash
0
       #  assert_routing 'controller/action/9', {:id => "9", :item => "square"}, {:controller => "controller", :action => "action"}, {}, {:item => "square"}
0
+      #
0
+      #  # Tests a route with a HTTP method
0
+      #  assert_routing({ :method => 'put', :path => '/product/321' }, { :controller => "product", :action => "update", :id => "321" })
0
       def assert_routing(path, options, defaults={}, extras={}, message=nil)
0
         assert_recognizes(options, path, extras, message)
0
         
0
@@ -122,7 +125,7 @@ module ActionController
0
           options[:controller] = "/#{controller}"
0
         end
0
          
0
-        assert_generates(path, options, defaults, extras, message)
0
+        assert_generates(path.is_a?(Hash) ? path[:path] : path, options, defaults, extras, message)
0
       end
0
 
0
       private
0
@@ -140,4 +143,4 @@ module ActionController
0
         end
0
     end
0
   end
0
-end
0
\ No newline at end of file
0
+end

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

0
@@ -1,5 +1,9 @@
0
 *SVN*
0
 
0
+* Make assert_routing aware of the HTTP method used.  #8039 [mpalmer]
0
+   e.g. assert_routing({ :method => 'put', :path => '/product/321' }, { :controller => "product", :action => "update", :id => "321" })
0
+
0
+
0
 * Ensure that modifying has_and_belongs_to_many actions clear the query cache.  Closes #10840 [john.andrews]
0
 
0
 * Fix issue where Table#references doesn't pass a :null option to a *_type attribute for polymorphic associations.  Closes #10753 [railsjitsu]