X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/09d5ae68ddae20abc653d0d6b2cf3ef9dc12da2e..4a38ab5c80d325457a1928d049847d82532f620d:/test/controllers/feeds/changeset_comments_controller_test.rb diff --git a/test/controllers/feeds/changeset_comments_controller_test.rb b/test/controllers/feeds/changeset_comments_controller_test.rb index aff04778b..a4149b0d5 100644 --- a/test/controllers/feeds/changeset_comments_controller_test.rb +++ b/test/controllers/feeds/changeset_comments_controller_test.rb @@ -7,7 +7,7 @@ module Feeds def test_routes assert_routing( { :path => "/changeset/1/comments/feed", :method => :get }, - { :controller => "feeds/changeset_comments", :action => "index", :id => "1", :format => "rss" } + { :controller => "feeds/changeset_comments", :action => "index", :changeset_id => "1", :format => "rss" } ) assert_routing( { :path => "/history/comments/feed", :method => :get }, @@ -21,7 +21,7 @@ module Feeds changeset = create(:changeset, :closed) create_list(:changeset_comment, 3, :changeset => changeset) - get changesets_comments_feed_path(:format => "rss") + get feeds_changeset_comments_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 changesets_comments_feed_path(:format => "rss", :limit => 2) + get feeds_changeset_comments_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_comments_feed_path(:id => changeset.id, :format => "rss") + get changeset_feeds_changeset_comments_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 changesets_comments_feed_path(:format => "rss", :limit => 0) + get feeds_changeset_comments_path(:format => "rss", :limit => 0) assert_response :bad_request - get changesets_comments_feed_path(:format => "rss", :limit => 100001) + get feeds_changeset_comments_path(:format => "rss", :limit => 100001) assert_response :bad_request end end