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

Rename Feeds::ChangesetCommentsController to ChangesetComments::FeedsController

Browse source 
We usually create nested controllers with the main controller as the module,
and the nested controller as the specialization, e.g. Users::DeletionsController
or Traces::IconsController.

This then leaves the topic of whether the feed resource is plural, and whether we
are then showing a singular feed or showing a list (index) of objects.

The routes are carefully named so that we have `changesets_comments_feed_path` (the
comments feed for all changesets) vs `changeset_comment_feed_path(changeset)` (the
comments for a singular changeset).
This commit is contained in:
Andy Allan 2024-08-28 18:18:26 +01:00
parent a948f2bc24
commit 10a4c5cf6e
10 changed files with 32 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

18
test/controllers/feeds/changeset_comments_controller_test.rb → test/controllers/changeset_comments/feeds_controller_test.rb
View file

@ -1,17 +1,17 @@
require "test_helper"
module Feeds
class ChangesetCommentsControllerTest < ActionDispatch::IntegrationTest
module ChangesetComments
class FeedsControllerTest < ActionDispatch::IntegrationTest
##
# test all routes which lead to this controller
def test_routes
assert_routing(
{ :path => "/changeset/1/comments/feed", :method => :get },
{ :controller => "feeds/changeset_comments", :action => "index", :changeset_id => "1", :format => "rss" }
{ :controller => "changeset_comments/feeds", :action => "show", :changeset_id => "1", :format => "rss" }
)
assert_routing(
{ :path => "/history/comments/feed", :method => :get },
{ :controller => "feeds/changeset_comments", :action => "index", :format => "rss" }
{ :controller => "changeset_comments/feeds", :action => "show", :format => "rss" }
)
end
@ -21,7 +21,7 @@ module Feeds
changeset = create(:changeset, :closed)
create_list(:changeset_comment, 3, :changeset => changeset)
get feeds_changeset_comments_path(:format => "rss")
get changesets_comments_feed_path(:format => "rss")
assert_response :success
assert_equal "application/rss+xml", @response.media_type
assert_select "rss", :count => 1 do
@ -30,7 +30,7 @@ module Feeds
end
end
get feeds_changeset_comments_path(:format => "rss", :limit => 2)
get changesets_comments_feed_path(:format => "rss", :limit => 2)
assert_response :success
assert_equal "application/rss+xml", @response.media_type
assert_select "rss", :count => 1 do
@ -39,7 +39,7 @@ module Feeds
end
end
get changeset_feeds_changeset_comments_path(changeset, :format => "rss")
get changeset_comments_feed_path(changeset, :format => "rss")
assert_response :success
assert_equal "application/rss+xml", @response.media_type
last_comment_id = -1
@ -62,10 +62,10 @@ module Feeds
##
# test comments feed
def test_feed_bad_limit
get feeds_changeset_comments_path(:format => "rss", :limit => 0)
get changesets_comments_feed_path(:format => "rss", :limit => 0)
assert_response :bad_request
get feeds_changeset_comments_path(:format => "rss", :limit => 100001)
get changesets_comments_feed_path(:format => "rss", :limit => 100001)
assert_response :bad_request
end
end