From 70448559b2c665f45d1716c30e7ae39e3226534b Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 5 Aug 2013 20:10:15 +0100
Subject: [PATCH] Remove format specifier from RSS feed route tests

---
 test/functional/changeset_controller_test.rb   | 6 +++---
 test/functional/diary_entry_controller_test.rb | 6 +++---
 test/functional/trace_controller_test.rb       | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/functional/changeset_controller_test.rb b/test/functional/changeset_controller_test.rb
index 05f2ff569..7a4d2e4f8 100644
--- a/test/functional/changeset_controller_test.rb
+++ b/test/functional/changeset_controller_test.rb
@@ -45,7 +45,7 @@ class ChangesetControllerTest < ActionController::TestCase
     )
     assert_routing(
       { :path => "/user/name/edits/feed", :method => :get },
-      { :controller => "changeset", :action => "feed", :display_name => "name", :format => :atom }
+      { :controller => "changeset", :action => "feed", :display_name => "name" }
     )
     assert_routing(
       { :path => "/browse/friends", :method => :get },
@@ -61,7 +61,7 @@ class ChangesetControllerTest < ActionController::TestCase
     )
     assert_routing(
       { :path => "/browse/changesets/feed", :method => :get },
-      { :controller => "changeset", :action => "feed", :format => :atom }
+      { :controller => "changeset", :action => "feed" }
     )
     assert_recognizes(
       { :controller => "changeset", :action => "list" },
@@ -72,7 +72,7 @@ class ChangesetControllerTest < ActionController::TestCase
       { :path => "/history", :method => :get }
     )
     assert_recognizes(
-      { :controller => "changeset", :action => "feed", :format => :atom },
+      { :controller => "changeset", :action => "feed" },
       { :path => "/history/feed", :method => :get }
     )
   end
diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb
index 2b85f9f49..06c31574d 100644
--- a/test/functional/diary_entry_controller_test.rb
+++ b/test/functional/diary_entry_controller_test.rb
@@ -31,15 +31,15 @@ class DiaryEntryControllerTest < ActionController::TestCase
 
     assert_routing(
       { :path => "/diary/rss", :method => :get },
-      { :controller => "diary_entry", :action => "rss", :format => :rss }
+      { :controller => "diary_entry", :action => "rss" }
     )
     assert_routing(
       { :path => "/diary/language/rss", :method => :get },
-      { :controller => "diary_entry", :action => "rss", :language => "language", :format => :rss }
+      { :controller => "diary_entry", :action => "rss", :language => "language" }
     )
     assert_routing(
       { :path => "/user/username/diary/rss", :method => :get },
-      { :controller => "diary_entry", :action => "rss", :display_name => "username", :format => :rss }
+      { :controller => "diary_entry", :action => "rss", :display_name => "username" }
     )
 
     assert_routing(
diff --git a/test/functional/trace_controller_test.rb b/test/functional/trace_controller_test.rb
index 4c97a4849..799f0759f 100644
--- 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(
-- 
2.39.5