Remove format specifier from RSS feed route tests

[rails.git] / test / functional / trace_controller_test.rb

diff --git a/test/functional/trace_controller_test.rb b/test/functional/trace_controller_test.rb
index 600fd589f2da68d778ba30b4f50ba8e1b4fdff88..799f0759f08bc1c994056bef34f36fc68c784deb 100644 (file)
--- a/test/functional/trace_controller_test.rb
+++ b/test/functional/trace_controller_test.rb
@@ -88,19 +88,19 @@ class TraceControllerTest < ActionController::TestCase
 
     assert_routing(
       { :path => "/traces/rss", :method => :get },
-      { :controller => "trace", :action => "georss", :format => :rss }
+      { :controller => "trace", :action => "georss" }
     )
     assert_routing(
       { :path => "/traces/tag/tagname/rss", :method => :get },
-      { :controller => "trace", :action => "georss", :tag => "tagname", :format => :rss }
+      { :controller => "trace", :action => "georss", :tag => "tagname" }
     )
     assert_routing(
       { :path => "/user/username/traces/rss", :method => :get },
-      { :controller => "trace", :action => "georss", :display_name => "username", :format => :rss }
+      { :controller => "trace", :action => "georss", :display_name => "username" }
     )
     assert_routing(
       { :path => "/user/username/traces/tag/tagname/rss", :method => :get },
-      { :controller => "trace", :action => "georss", :display_name => "username", :tag => "tagname", :format => :rss }
+      { :controller => "trace", :action => "georss", :display_name => "username", :tag => "tagname" }
     )
 
     assert_routing(
@@ -141,7 +141,7 @@ class TraceControllerTest < ActionController::TestCase
       { :controller => "trace", :action => "edit", :id => "1" }
     )
     assert_routing(
-      { :path => "/trace/1/edit", :method => :put },
+      { :path => "/trace/1/edit", :method => :patch },
       { :controller => "trace", :action => "edit", :id => "1" }
     )
     assert_routing(