Fix routing of changeset feed

diff --git a/config/routes.rb b/config/routes.rb
index 7e078539ee1d6e86f0d06b612a4aef9cbf19de4f..68a5bacf6171f99d7e5e5a16802ec3a695eeb05c 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -112,12 +112,12 @@ OpenStreetMap::Application.routes.draw do
   match '/browse/changeset/:id' => 'browse#changeset', :via => :get, :as => :changeset, :id => /\d+/
   match '/browse/note/:id' => 'browse#note', :via => :get, :id => /\d+/, :as => "browse_note"
   match '/user/:display_name/edits' => 'changeset#list', :via => :get
-  match '/user/:display_name/edits/feed' => 'changeset#feed', :via => :get, :format => :atom
+  match '/user/:display_name/edits/feed' => 'changeset#feed', :via => :get, :defaults => { :format => :atom }
   match '/user/:display_name/notes' => 'notes#mine', :via => :get
   match '/browse/friends' => 'changeset#list', :via => :get, :friends => true, :as => "friend_changesets"
   match '/browse/nearby' => 'changeset#list', :via => :get, :nearby => true, :as => "nearby_changesets"
   match '/browse/changesets' => 'changeset#list', :via => :get
-  match '/browse/changesets/feed' => 'changeset#feed', :via => :get, :format => :atom
+  match '/browse/changesets/feed' => 'changeset#feed', :via => :get, :defaults => { :format => :atom }
   match '/browse' => 'changeset#list', :via => :get
 
   # web site
@@ -127,7 +127,7 @@ OpenStreetMap::Application.routes.draw do
   match '/copyright' => 'site#copyright', :via => :get
   match '/welcome' => 'site#welcome', :via => :get, :as => :welcome
   match '/history' => 'changeset#list', :via => :get
-  match '/history/feed' => 'changeset#feed', :via => :get, :format => :atom
+  match '/history/feed' => 'changeset#feed', :via => :get, :defaults => { :format => :atom }
   match '/export' => 'site#index', :export => true, :via => :get
   match '/login' => 'user#login', :via => [:get, :post]
   match '/logout' => 'user#logout', :via => [:get, :post]

diff --git a/test/functional/changeset_controller_test.rb b/test/functional/changeset_controller_test.rb
index 7a4d2e4f86e702ffe07f77ad4c2c4725a8eb2a04..05f2ff569a53f0818d6a140e8ce4cb9e44446233 100644 (file)
--- 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" }
+      { :controller => "changeset", :action => "feed", :display_name => "name", :format => :atom }
     )
     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" }
+      { :controller => "changeset", :action => "feed", :format => :atom }
     )
     assert_recognizes(
       { :controller => "changeset", :action => "list" },
@@ -72,7 +72,7 @@ class ChangesetControllerTest < ActionController::TestCase
       { :path => "/history", :method => :get }
     )
     assert_recognizes(
-      { :controller => "changeset", :action => "feed" },
+      { :controller => "changeset", :action => "feed", :format => :atom },
       { :path => "/history/feed", :method => :get }
     )
   end