X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7cf9bf0e553a141acab2afea53842f97eddd0a40..4485cae913bbb7c138aa435bf0ecfd8d8f6f5095:/test/controllers/api/ways_controller_test.rb diff --git a/test/controllers/api/ways_controller_test.rb b/test/controllers/api/ways_controller_test.rb index e81b49b81..50077f09c 100644 --- a/test/controllers/api/ways_controller_test.rb +++ b/test/controllers/api/ways_controller_test.rb @@ -17,14 +17,6 @@ module Api { :path => "/api/0.6/ways", :method => :post }, { :controller => "api/ways", :action => "create" } ) - assert_routing( - { :path => "/api/0.6/way/1/full", :method => :get }, - { :controller => "api/ways", :action => "full", :id => "1" } - ) - assert_routing( - { :path => "/api/0.6/way/1/full.json", :method => :get }, - { :controller => "api/ways", :action => "full", :id => "1", :format => "json" } - ) assert_routing( { :path => "/api/0.6/way/1", :method => :get }, { :controller => "api/ways", :action => "show", :id => "1" } @@ -33,13 +25,21 @@ module Api { :path => "/api/0.6/way/1.json", :method => :get }, { :controller => "api/ways", :action => "show", :id => "1", :format => "json" } ) + assert_routing( + { :path => "/api/0.6/way/1/full", :method => :get }, + { :controller => "api/ways", :action => "show", :full => true, :id => "1" } + ) + assert_routing( + { :path => "/api/0.6/way/1/full.json", :method => :get }, + { :controller => "api/ways", :action => "show", :full => true, :id => "1", :format => "json" } + ) assert_routing( { :path => "/api/0.6/way/1", :method => :put }, { :controller => "api/ways", :action => "update", :id => "1" } ) assert_routing( { :path => "/api/0.6/way/1", :method => :delete }, - { :controller => "api/ways", :action => "delete", :id => "1" } + { :controller => "api/ways", :action => "destroy", :id => "1" } ) assert_recognizes( @@ -96,26 +96,50 @@ module Api # Test showing ways. # ------------------------------------- - def test_show - # check that a visible way is returned properly - get api_way_path(create(:way)) - assert_response :success + def test_show_not_found + get api_way_path(0) + assert_response :not_found + end - # check that an invisible way is not returned + def test_show_deleted get api_way_path(create(:way, :deleted)) assert_response :gone + end - # check chat a non-existent way is not returned - get api_way_path(0) - assert_response :not_found + def test_show + way = create(:way, :timestamp => "2021-02-03T00:00:00Z") + node = create(:node, :timestamp => "2021-04-05T00:00:00Z") + create(:way_node, :way => way, :node => node) + + get api_way_path(way) + + assert_response :success + assert_not_nil @response.header["Last-Modified"] + assert_equal "2021-02-03T00:00:00Z", Time.parse(@response.header["Last-Modified"]).utc.xmlschema + end + + def test_show_json + way = create(:way_with_nodes, :nodes_count => 3) + + get api_way_path(way, :format => "json") + + assert_response :success + + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal 1, js["elements"].count + js_ways = js["elements"].filter { |e| e["type"] == "way" } + assert_equal 1, js_ways.count + assert_equal way.id, js_ways[0]["id"] + assert_equal 1, js_ways[0]["version"] end ## # check the "full" mode - def test_full + def test_show_full way = create(:way_with_nodes, :nodes_count => 3) - get way_full_path(way) + get api_way_path(way, :full => true) assert_response :success @@ -130,10 +154,42 @@ module Api end end - def test_full_deleted + def test_show_full_json + way = create(:way_with_nodes, :nodes_count => 3) + + get api_way_path(way, :full => true, :format => "json") + + assert_response :success + + # Check the way is correctly returned + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal 4, js["elements"].count + js_ways = js["elements"].filter { |e| e["type"] == "way" } + assert_equal 1, js_ways.count + assert_equal way.id, js_ways[0]["id"] + assert_equal 1, js_ways[0]["version"] + + # check that each node in the way appears once in the output as a + # reference and as the node element. + js_nodes = js["elements"].filter { |e| e["type"] == "node" } + assert_equal 3, js_nodes.count + + way.nodes.each_with_index do |n, i| + assert_equal n.id, js_ways[0]["nodes"][i] + js_nodes_with_id = js_nodes.filter { |e| e["id"] == n.id } + assert_equal 1, js_nodes_with_id.count + assert_equal n.id, js_nodes_with_id[0]["id"] + assert_equal 1, js_nodes_with_id[0]["version"] + assert_equal n.lat, js_nodes_with_id[0]["lat"] + assert_equal n.lon, js_nodes_with_id[0]["lon"] + end + end + + def test_show_full_deleted way = create(:way, :deleted) - get way_full_path(way) + get api_way_path(way, :full => true) assert_response :gone end @@ -284,7 +340,7 @@ module Api # Test deleting ways. # ------------------------------------- - def test_delete + def test_destroy private_user = create(:user, :data_public => false) private_open_changeset = create(:changeset, :user => private_user) private_closed_changeset = create(:changeset, :closed, :user => private_user) @@ -722,42 +778,6 @@ module Api assert_equal "Element way/ has duplicate tags with key addr:housenumber", @response.body end - ## - # test that a call to ways_for_node returns all ways that contain the node - # and none that don't. - def test_ways_for_node - node = create(:node) - way1 = create(:way) - way2 = create(:way) - create(:way_node, :way => way1, :node => node) - create(:way_node, :way => way2, :node => node) - # create an unrelated way - create(:way_with_nodes, :nodes_count => 2) - # create a way which used to use the node - way3_v1 = create(:old_way, :version => 1) - _way3_v2 = create(:old_way, :current_way => way3_v1.current_way, :version => 2) - create(:old_way_node, :old_way => way3_v1, :node => node) - - get node_ways_path(node) - assert_response :success - ways_xml = XML::Parser.string(@response.body).parse - assert_not_nil ways_xml, "failed to parse ways_for_node response" - - # check that the set of IDs match expectations - expected_way_ids = [way1.id, - way2.id] - found_way_ids = ways_xml.find("//osm/way").collect { |w| w["id"].to_i } - assert_equal expected_way_ids.sort, found_way_ids.sort, - "expected ways for node #{node.id} did not match found" - - # check the full ways to ensure we're not missing anything - expected_way_ids.each do |id| - way_xml = ways_xml.find("//osm/way[@id='#{id}']").first - assert_ways_are_equal(Way.find(id), - Way.from_xml_node(way_xml)) - end - end - ## # test initial rate limit def test_initial_rate_limit