X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9a9b045372a6f48420a9a6dacfde52c34ab7abce..d48603d9e07c24421309ccedbf554beea715115b:/test/controllers/amf_controller_test.rb diff --git a/test/controllers/amf_controller_test.rb b/test/controllers/amf_controller_test.rb index d388114dd..aa1d43a32 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 @@ -308,8 +320,7 @@ class AmfControllerTest < ActionController::TestCase # try to get version 1 v1 = ways(:way_with_versions_v2) { latest.id => "", - v1.way_id => v1.timestamp.strftime("%d %b %Y, %H:%M:%S") - }.each do |id, t| + v1.way_id => v1.timestamp.strftime("%d %b %Y, %H:%M:%S") }.each do |id, t| amf_content "getway_old", "/1", [id, t] post :amf_read assert_response :success @@ -329,10 +340,9 @@ class AmfControllerTest < ActionController::TestCase way_id = current_ways(:way_with_versions).id { "foo" => "bar", way_id => "not a date", - way_id => "2009-03-25 00:00:00", # <- wrong format - way_id => "0 Jan 2009 00:00:00", # <- invalid date - -1 => "1 Jan 2009 00:00:00" # <- invalid ID - }.each do |id, t| + way_id => "2009-03-25 00:00:00", # <- wrong format + way_id => "0 Jan 2009 00:00:00", # <- invalid date + -1 => "1 Jan 2009 00:00:00" }.each do |id, t| # <- invalid amf_content "getway_old", "/1", [id, t] post :amf_read assert_response :success @@ -352,8 +362,7 @@ class AmfControllerTest < ActionController::TestCase # try to get specific version of non-existent way [[0, ""], [0, "1 Jan 1970, 00:00:00"], - [v1.way_id, (v1.timestamp - 10).strftime("%d %b %Y, %H:%M:%S")] - ].each do |id, t| + [v1.way_id, (v1.timestamp - 10).strftime("%d %b %Y, %H:%M:%S")]].each do |id, t| amf_content "getway_old", "/1", [id, t] post :amf_read assert_response :success @@ -369,8 +378,7 @@ class AmfControllerTest < ActionController::TestCase def test_getway_old_invisible v1 = ways(:invisible_way) # try to get deleted version - [[v1.way_id, (v1.timestamp + 10).strftime("%d %b %Y, %H:%M:%S")] - ].each do |id, t| + [[v1.way_id, (v1.timestamp + 10).strftime("%d %b %Y, %H:%M:%S")]].each do |id, t| amf_content "getway_old", "/1", [id, t] post :amf_read assert_response :success @@ -418,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 @@ -430,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 @@ -464,7 +476,9 @@ class AmfControllerTest < ActionController::TestCase assert_equal -1, result[0] assert_match /must be logged in/, result[1] - 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 @@ -476,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 @@ -534,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