X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5d3ecffa28510c867665001a7615559a185869c6..119016255ec56bb7e7bc74be19858380e868da93:/test/controllers/changeset_controller_test.rb diff --git a/test/controllers/changeset_controller_test.rb b/test/controllers/changeset_controller_test.rb index 4ce264d62..ecccb1f5f 100644 --- a/test/controllers/changeset_controller_test.rb +++ b/test/controllers/changeset_controller_test.rb @@ -1181,8 +1181,7 @@ EOF ["", "", "", - "" - ].each do |diff| + ""].each do |diff| # upload it content diff post :upload, :id => changesets(:public_user_first_change).id @@ -1574,7 +1573,7 @@ EOF get :query, :closed => "true" assert_response :success, "can't get changesets by closed-ness" - assert_changesets [3, 5, 6, 7, 8] + assert_changesets [3, 5, 6, 7, 8, 9] get :query, :closed => "true", :user => users(:normal_user).id assert_response :success, "can't get changesets by closed-ness and user" @@ -1598,8 +1597,7 @@ EOF def test_query_invalid ["abracadabra!", "1,2,3,F", - ";drop table users;" - ].each do |bbox| + ";drop table users;"].each do |bbox| get :query, :bbox => bbox assert_response :bad_request, "'#{bbox}' isn't a bbox" end @@ -1608,8 +1606,7 @@ EOF "00-00-00", ";drop table users;", ",", - "-,-" - ].each do |time| + "-,-"].each do |time| get :query, :time => time assert_response :bad_request, "'#{time}' isn't a valid time range" end @@ -1617,8 +1614,7 @@ EOF ["me", "foobar", "-1", - "0" - ].each do |uid| + "0"].each do |uid| get :query, :user => uid assert_response :bad_request, "'#{uid}' isn't a valid user ID" end @@ -2339,10 +2335,11 @@ EOF assert changesets.size <= 20 assert_select "feed", :count => [changesets.size, 1].min do - assert_select "entry", :count => changesets.size + assert_select "> title", :count => 1, :text => /^Changesets/ + assert_select "> entry", :count => changesets.size changesets.each do |changeset| - assert_select "entry > id", changeset_url(:id => changeset.id) + assert_select "> entry > id", changeset_url(:id => changeset.id) end end end