cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move changeset comment feeds out of the API namespace

Browse source
This commit is contained in:
Tom Hughes 2014-10-23 21:40:13 +01:00
parent 72a7fc67ca
commit f636391580
2 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/routes.rb
View file

@ -15,7 +15,6 @@ OpenStreetMap::Application.routes.draw do
match 'api/0.6/changeset/:id/close' => 'changeset#close', :via => :put, :id => /\d+/
match 'api/0.6/changesets' => 'changeset#query', :via => :get
post 'api/0.6/changeset/:id/comment' => 'changeset#comment', :as => :changeset_comment, :id => /\d+/
get 'api/0.6/changeset(/:id)/comments/feed' => 'changeset#comments_feed', :as => :changeset_comments_feed, :id => /\d*/, :defaults => { :format => 'rss' }
post 'api/0.6/changeset/comment/:id/hide' => 'changeset#hide_comment', :as => :changeset_comment_hide, :id => /\d+/
post 'api/0.6/changeset/comment/:id/unhide' => 'changeset#unhide_comment', :as => :changeset_comment_unhide, :id => /\d+/
@ -115,6 +114,7 @@ OpenStreetMap::Application.routes.draw do
match '/relation/:id' => 'browse#relation', :via => :get, :id => /\d+/, :as => :relation
match '/relation/:id/history' => 'browse#relation_history', :via => :get, :id => /\d+/
match '/changeset/:id' => 'browse#changeset', :via => :get, :as => :changeset, :id => /\d+/
match '/changeset/:id/comments/feed' => 'changeset#comments_feed', :via => :get, :as => :changeset_comments_feed, :id => /\d*/, :defaults => { :format => 'rss' }
match '/note/:id' => 'browse#note', :via => :get, :id => /\d+/, :as => "browse_note"
match '/note/new' => 'browse#new_note', :via => :get
match '/user/:display_name/history' => 'changeset#list', :via => :get
@ -150,6 +150,7 @@ OpenStreetMap::Application.routes.draw do
match '/about' => 'site#about', :via => :get, :as => :about
match '/history' => 'changeset#list', :via => :get
match '/history/feed' => 'changeset#feed', :via => :get, :defaults => { :format => :atom }
match '/history/comments/feed' => 'changeset#comments_feed', :via => :get, :as => :changesets_comments_feed, :defaults => { :format => 'rss' }
match '/export' => 'site#export', :via => :get
match '/login' => 'user#login', :via => [:get, :post]
match '/logout' => 'user#logout', :via => [:get, :post]

16
test/controllers/changeset_controller_test.rb
View file

@ -48,14 +48,6 @@ class ChangesetControllerTest < ActionController::TestCase
{ :path => "/api/0.6/changeset/1/comment", :method => :post },
{ :controller => "changeset", :action => "comment", :id => "1" }
)
assert_routing(
{ :path => "/api/0.6/changeset/comments/feed", :method => :get },
{ :controller => "changeset", :action => "comments_feed", :format =>"rss" }
)
assert_routing(
{ :path => "/api/0.6/changeset/1/comments/feed", :method => :get },
{ :controller => "changeset", :action => "comments_feed", :id => "1", :format =>"rss" }
)
assert_routing(
{ :path => "/api/0.6/changeset/comment/1/hide", :method => :post },
{ :controller => "changeset", :action => "hide_comment", :id => "1" }
@ -68,6 +60,10 @@ class ChangesetControllerTest < ActionController::TestCase
{ :path => "/api/0.6/changesets", :method => :get },
{ :controller => "changeset", :action => "query" }
)
assert_routing(
{ :path => "/changeset/1/comments/feed", :method => :get },
{ :controller => "changeset", :action => "comments_feed", :id => "1", :format =>"rss" }
)
assert_routing(
{ :path => "/user/name/history", :method => :get },
{ :controller => "changeset", :action => "list", :display_name => "name" }
@ -92,6 +88,10 @@ class ChangesetControllerTest < ActionController::TestCase
{ :path => "/history/feed", :method => :get },
{ :controller => "changeset", :action => "feed", :format => :atom }
)
assert_routing(
{ :path => "/history/comments/feed", :method => :get },
{ :controller => "changeset", :action => "comments_feed", :format =>"rss" }
)
end
# -----------------------