X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/783528830ad1b0d5f07c8e758747841a0b4e5cc6..12b779f0b4ad730d42f3042da5da387bc288f929:/test/functional/changeset_controller_test.rb diff --git a/test/functional/changeset_controller_test.rb b/test/functional/changeset_controller_test.rb index 47cd95c24..b5d65d46d 100644 --- a/test/functional/changeset_controller_test.rb +++ b/test/functional/changeset_controller_test.rb @@ -65,8 +65,14 @@ class ChangesetControllerTest < ActionController::TestCase def test_close basic_authorization "test@openstreetmap.org", "test" - put :close, :id => changesets(:normal_user_first_change).id + cs_id = changesets(:normal_user_first_change).id + put :close, :id => cs_id assert_response :success + + # test that it really is closed now + cs = Changeset.find(cs_id) + assert(!cs.is_open?, + "changeset should be closed now (#{cs.closed_at} > #{Time.now}.") end ## @@ -199,6 +205,11 @@ EOF assert_response :success, "can't upload a deletion diff to changeset: #{@response.body}" + # check the response is well-formed + assert_select "diffResult>node", 1 + assert_select "diffResult>way", 1 + assert_select "diffResult>relation", 2 + # check that everything was deleted assert_equal false, Node.find(current_nodes(:node_used_by_relationship).id).visible assert_equal false, Way.find(current_ways(:used_way).id).visible @@ -310,7 +321,7 @@ EOF - + @@ -361,6 +372,11 @@ EOF post :upload, :id => 1 assert_response :success, "can't upload multiple versions of an element in a diff: #{@response.body}" + + # check the response is well-formed. its counter-intuitive, but the + # API will return multiple elements with the same ID and different + # version numbers for each change we made. + assert_select "diffResult>node", 8 end ## @@ -423,6 +439,115 @@ EOF assert_equal @response.body, "Unknown action ping, choices are create, modify, delete." end + ## + # upload a valid changeset which has a mixture of whitespace + # to check a bug reported by ivansanchez (#1565). + def test_upload_whitespace_valid + basic_authorization "test@openstreetmap.org", "test" + + diff = < + + + + + + + +EOF + + # upload it + content diff + post :upload, :id => 1 + assert_response :success, + "can't upload a valid diff with whitespace variations to changeset: #{@response.body}" + + # check the response is well-formed + assert_select "diffResult>node", 2 + assert_select "diffResult>relation", 1 + + # check that the changes made it into the database + assert_equal 1, Node.find(1).tags.size, "node 1 should now have one tag" + assert_equal 0, Relation.find(1).tags.size, "relation 1 should now have no tags" + end + + ## + # upload a valid changeset which has a mixture of whitespace + # to check a bug reported by ivansanchez. + def test_upload_reuse_placeholder_valid + basic_authorization "test@openstreetmap.org", "test" + + diff = < + + + + + + + + + + + + +EOF + + # upload it + content diff + post :upload, :id => 1 + assert_response :success, + "can't upload a valid diff with re-used placeholders to changeset: #{@response.body}" + + # check the response is well-formed + assert_select "diffResult>node", 3 + assert_select "diffResult>node[old_id=-1]", 3 + end + + ## + # test what happens if a diff upload re-uses placeholder IDs in an + # illegal way. + def test_upload_placeholder_invalid + basic_authorization "test@openstreetmap.org", "test" + + diff = < + + + + + + +EOF + + # upload it + content diff + post :upload, :id => 1 + assert_response :bad_request, + "shouldn't be able to re-use placeholder IDs" + end + + ## + # test for more issues in #1568 + def test_upload_empty_invalid + basic_authorization "test@openstreetmap.org", "test" + + [ "", + "", + "", + "" + ].each do |diff| + # upload it + content diff + post :upload, :id => 1 + assert_response(:success, "should be able to upload " + + "empty changeset: " + diff) + end + end + ## # when we make some simple changes we get the same changes back from the # diff download. @@ -669,7 +794,7 @@ EOF def test_query get :query, :bbox => "-10,-10, 10, 10" assert_response :success, "can't get changesets in bbox" - assert_changesets [1,4] + assert_changesets [1,4,6] get :query, :bbox => "4.5,4.5,4.6,4.6" assert_response :success, "can't get changesets in bbox" @@ -683,7 +808,7 @@ EOF basic_authorization "test@openstreetmap.org", "test" get :query, :user => users(:normal_user).id assert_response :success, "can't get changesets by user" - assert_changesets [1,3,4] + assert_changesets [1,3,4,6] get :query, :user => users(:normal_user).id, :open => true assert_response :success, "can't get changesets by user and open" @@ -691,15 +816,15 @@ EOF get :query, :time => '2007-12-31' assert_response :success, "can't get changesets by time-since" - assert_changesets [1,2,4,5] + assert_changesets [1,2,4,5,6] get :query, :time => '2008-01-01T12:34Z' assert_response :success, "can't get changesets by time-since with hour" - assert_changesets [1,2,4,5] + assert_changesets [1,2,4,5,6] get :query, :time => '2007-12-31T23:59Z,2008-01-01T00:01Z' assert_response :success, "can't get changesets by time-range" - assert_changesets [1,4,5] + assert_changesets [1,4,5,6] get :query, :open => 'true' assert_response :success, "can't get changesets by open-ness" @@ -741,16 +866,25 @@ EOF ## # check updating tags on a changeset def test_changeset_update - basic_authorization "test@openstreetmap.org", "test" - changeset = changesets(:normal_user_first_change) new_changeset = changeset.to_xml new_tag = XML::Node.new "tag" new_tag['k'] = "tagtesting" new_tag['v'] = "valuetesting" new_changeset.find("//osm/changeset").first << new_tag - content new_changeset + + # try without any authorization + put :update, :id => changeset.id + assert_response :unauthorized + + # try with the wrong authorization + basic_authorization "test@example.com", "test" + put :update, :id => changeset.id + assert_response :conflict + + # now this should work... + basic_authorization "test@openstreetmap.org", "test" put :update, :id => changeset.id assert_response :success @@ -831,6 +965,11 @@ EOF changeset = Changeset.find(cs_id) assert_equal Changeset::MAX_ELEMENTS + 1, changeset.num_changes + + # check that the changeset is now closed as well + assert(!changeset.is_open?, + "changeset should have been auto-closed by exceeding " + + "element limit.") end #------------------------------------------------------------ @@ -851,7 +990,7 @@ EOF # call the include method and assert properties of the bbox def check_after_include(changeset_id, lon, lat, bbox) content "" - post :include, :id => changeset_id + post :expand_bbox, :id => changeset_id assert_response :success, "Setting include of changeset failed: #{@response.body}" # check exactly one changeset