X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f6695c9079f4eeeecaa796c879868f797f97cd55..881015036ca9e65a21d654013b2b2c278390a536:/test/controllers/amf_controller_test.rb diff --git a/test/controllers/amf_controller_test.rb b/test/controllers/amf_controller_test.rb index 7c8c64ba0..2d358d011 100644 --- a/test/controllers/amf_controller_test.rb +++ b/test/controllers/amf_controller_test.rb @@ -19,9 +19,9 @@ class AmfControllerTest < ActionController::TestCase end def test_getpresets - [:public_user, :german_user].each do |id| - user = users(id) - + user_en_de = create(:user, :languages => %w(en de)) + user_de = create(:user, :languages => %w(de)) + [user_en_de, user_de].each do |user| amf_content "getpresets", "/1", ["#{user.email}:test", ""] post :amf_read assert_response :success @@ -144,7 +144,13 @@ class AmfControllerTest < ActionController::TestCase end def test_whichways - node = current_nodes(:used_node_1) + node = create(:node, :lat => 3.0, :lon => 3.0) + way = create(:way) + deleted_way = create(:way, :deleted) + create(:way_node, :way => way, :node => node) + create(:way_node, :way => deleted_way, :node => node) + create(:way_tag, :way => way) + minlon = node.lon - 0.1 minlat = node.lat - 0.1 maxlon = node.lon + 0.1 @@ -190,9 +196,9 @@ class AmfControllerTest < ActionController::TestCase # TODO: looks like amf_controller changed since this test was written # so someone who knows what they're doing should check this! ways = map[2].collect { |x| x[0] } - assert ways.include?(current_ways(:used_way).id), + assert ways.include?(way.id), "map should include used way" - assert !ways.include?(current_ways(:invisible_way).id), + assert !ways.include?(deleted_way.id), "map should not include deleted way" end @@ -229,7 +235,13 @@ class AmfControllerTest < ActionController::TestCase end def test_whichways_deleted - node = current_nodes(:used_node_1) + node = create(:node, :lat => 3.0, :lon => 3.0) + way = create(:way) + deleted_way = create(:way, :deleted) + create(:way_node, :way => way, :node => node) + create(:way_node, :way => deleted_way, :node => node) + create(:way_tag, :way => way) + minlon = node.lon - 0.1 minlat = node.lat - 0.1 maxlon = node.lon + 0.1 @@ -414,8 +426,12 @@ class AmfControllerTest < ActionController::TestCase end def test_getnode_history - latest = current_nodes(:node_with_versions) - amf_content "getnode_history", "/1", [latest.id] + node = create(:node, :version => 2) + node_v1 = create(:old_node, :current_node => node, :version => 1, :timestamp => 3.days.ago) + _node_v2 = create(:old_node, :current_node => node, :version => 2, :timestamp => 2.days.ago) + node_v3 = create(:old_node, :current_node => node, :version => 3, :timestamp => 1.day.ago) + + amf_content "getnode_history", "/1", [node.id] post :amf_read assert_response :success amf_parse_response @@ -426,13 +442,13 @@ class AmfControllerTest < ActionController::TestCase # to the next second assert_equal history[0], "node", 'first element should be "node"' - assert_equal history[1], latest.id, + assert_equal history[1], node.id, "second element should be the input node ID" assert_equal history[2].first[0], - (latest.timestamp + 1).strftime("%d %b %Y, %H:%M:%S"), + (node_v3.timestamp + 1).strftime("%d %b %Y, %H:%M:%S"), "first element in third element (array) should be the latest version" assert_equal history[2].last[0], - (nodes(:node_with_versions_v1).timestamp + 1).strftime("%d %b %Y, %H:%M:%S"), + (node_v1.timestamp + 1).strftime("%d %b %Y, %H:%M:%S"), "last element in third element (array) should be the initial version" end @@ -460,8 +476,9 @@ class AmfControllerTest < ActionController::TestCase assert_equal -1, result[0] assert_match /must be logged in/, result[1] - create(:user_block, :user => users(:blocked_user)) - amf_content "findgpx", "/1", [1, "blocked@openstreetmap.org:test"] + blocked_user = create(:user) + create(:user_block, :user => blocked_user) + amf_content "findgpx", "/1", [1, "#{blocked_user.email}:test"] post :amf_read assert_response :success amf_parse_response @@ -473,9 +490,10 @@ class AmfControllerTest < ActionController::TestCase end def test_findgpx_by_id - trace = gpx_files(:anon_trace_file) + user = create(:user) + trace = create(:trace, :visibility => "private", :user => user) - amf_content "findgpx", "/1", [trace.id, "test@example.com:test"] + amf_content "findgpx", "/1", [trace.id, "#{user.email}:test"] post :amf_read assert_response :success amf_parse_response @@ -531,7 +549,10 @@ class AmfControllerTest < ActionController::TestCase def test_findrelations_by_tags visible_relation = current_relations(:visible_relation) + create(:relation_tag, :relation => visible_relation, :k => "test", :v => "yes") used_relation = current_relations(:used_relation) + create(:relation_tag, :relation => used_relation, :k => "test", :v => "yes") + create(:relation_tag, :relation => used_relation, :k => "name", :v => "Test Relation") amf_content "findrelations", "/1", ["yes"] post :amf_read @@ -561,7 +582,8 @@ class AmfControllerTest < ActionController::TestCase end def test_getpoi_without_timestamp - node = current_nodes(:node_with_versions) + node = create(:node, :with_history, :version => 4) + create(:node_tag, :node => node) amf_content "getpoi", "/1", [node.id, ""] post :amf_read @@ -591,10 +613,14 @@ class AmfControllerTest < ActionController::TestCase end def test_getpoi_with_timestamp - node = nodes(:node_with_versions_v2) - current_node = current_nodes(:node_with_versions) + current_node = create(:node, :with_history, :version => 4) + node = current_node.old_nodes.find_by(:version => 2) - amf_content "getpoi", "/1", [node.node_id, node.timestamp.xmlschema] + # Timestamps are stored with microseconds, but xmlschema truncates them to + # previous whole second, causing <= comparison to fail + timestamp = (node.timestamp + 1.second).xmlschema + + amf_content "getpoi", "/1", [node.node_id, timestamp] post :amf_read assert_response :success amf_parse_response @@ -637,9 +663,10 @@ class AmfControllerTest < ActionController::TestCase # check that we can update a poi def test_putpoi_update_valid - nd = current_nodes(:visible_node) - cs_id = changesets(:public_user_first_change).id - amf_content "putpoi", "/1", ["test@example.com:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, nd.visible] + nd = create(:node) + cs_id = nd.changeset.id + user = nd.changeset.user + amf_content "putpoi", "/1", ["#{user.email}:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, nd.visible] post :amf_write assert_response :success amf_parse_response @@ -655,7 +682,7 @@ class AmfControllerTest < ActionController::TestCase # Now try to update again, with a different lat/lon, using the updated version number lat = nd.lat + 0.1 lon = nd.lon - 0.1 - amf_content "putpoi", "/2", ["test@example.com:test", cs_id, nd.version + 1, nd.id, lon, lat, nd.tags, nd.visible] + amf_content "putpoi", "/2", ["#{user.email}:test", cs_id, nd.version + 1, nd.id, lon, lat, nd.tags, nd.visible] post :amf_write assert_response :success amf_parse_response @@ -813,9 +840,11 @@ class AmfControllerTest < ActionController::TestCase # try deleting a node def test_putpoi_delete_valid - nd = current_nodes(:visible_node) - cs_id = changesets(:public_user_first_change).id - amf_content "putpoi", "/1", ["test@example.com:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, false] + nd = create(:node) + cs_id = nd.changeset.id + user = nd.changeset.user + + amf_content "putpoi", "/1", ["#{user.email}:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, false] post :amf_write assert_response :success amf_parse_response @@ -834,9 +863,11 @@ class AmfControllerTest < ActionController::TestCase # try deleting a node that is already deleted def test_putpoi_delete_already_deleted - nd = current_nodes(:invisible_node) - cs_id = changesets(:public_user_first_change).id - amf_content "putpoi", "/1", ["test@example.com:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, false] + nd = create(:node, :deleted) + cs_id = nd.changeset.id + user = nd.changeset.user + + amf_content "putpoi", "/1", ["#{user.email}:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, false] post :amf_write assert_response :success amf_parse_response @@ -850,8 +881,11 @@ class AmfControllerTest < ActionController::TestCase # try deleting a node that has never existed def test_putpoi_delete_not_found - cs_id = changesets(:public_user_first_change).id - amf_content "putpoi", "/1", ["test@example.com:test", cs_id, 1, 999999, 0, 0, {}, false] + changeset = create(:changeset) + cs_id = changeset.id + user = changeset.user + + amf_content "putpoi", "/1", ["#{user.email}:test", cs_id, 1, 999999, 0, 0, {}, false] post :amf_write assert_response :success amf_parse_response @@ -865,9 +899,11 @@ class AmfControllerTest < ActionController::TestCase # try setting an invalid location on a node def test_putpoi_invalid_latlon - nd = current_nodes(:visible_node) - cs_id = changesets(:public_user_first_change).id - amf_content "putpoi", "/1", ["test@example.com:test", cs_id, nd.version, nd.id, 200, 100, nd.tags, true] + nd = create(:node) + cs_id = nd.changeset.id + user = nd.changeset.user + + amf_content "putpoi", "/1", ["#{user.email}:test", cs_id, nd.version, nd.id, 200, 100, nd.tags, true] post :amf_write assert_response :success amf_parse_response