cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert api element history actions to versions resources

Browse source
This commit is contained in:
Anton Khorev 2025-02-05 17:39:26 +03:00
parent 974e404a6e
commit 98af87d1cb
16 changed files with 175 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

89
test/controllers/api/old_nodes_controller_test.rb
View file

@ -2,25 +2,21 @@ require "test_helper"
module Api
class OldNodesControllerTest < ActionDispatch::IntegrationTest
#
# TODO: test history
#
##
# test all routes which lead to this controller
def test_routes
assert_routing(
{ :path => "/api/0.6/node/1/history", :method => :get },
{ :controller => "api/old_nodes", :action => "history", :id => "1" }
{ :controller => "api/old_nodes", :action => "index", :node_id => "1" }
)
assert_routing(
{ :path => "/api/0.6/node/1/history.json", :method => :get },
{ :controller => "api/old_nodes", :action => "index", :node_id => "1", :format => "json" }
)
assert_routing(
{ :path => "/api/0.6/node/1/2", :method => :get },
{ :controller => "api/old_nodes", :action => "show", :id => "1", :version => "2" }
)
assert_routing(
{ :path => "/api/0.6/node/1/history.json", :method => :get },
{ :controller => "api/old_nodes", :action => "history", :id => "1", :format => "json" }
)
assert_routing(
{ :path => "/api/0.6/node/1/2.json", :method => :get },
{ :controller => "api/old_nodes", :action => "show", :id => "1", :version => "2", :format => "json" }
@ -31,6 +27,49 @@ module Api
)
end
def test_index
node = create(:node, :version => 2)
create(:old_node, :node_id => node.id, :version => 1, :latitude => 60 * OldNode::SCALE, :longitude => 30 * OldNode::SCALE)
create(:old_node, :node_id => node.id, :version => 2, :latitude => 61 * OldNode::SCALE, :longitude => 31 * OldNode::SCALE)
get api_node_versions_path(node)
assert_response :success
assert_dom "osm:root", 1 do
assert_dom "> node", 2 do |dom_nodes|
assert_dom dom_nodes[0], "> @id", node.id.to_s
assert_dom dom_nodes[0], "> @version", "1"
assert_dom dom_nodes[0], "> @lat", "60.0000000"
assert_dom dom_nodes[0], "> @lon", "30.0000000"
assert_dom dom_nodes[1], "> @id", node.id.to_s
assert_dom dom_nodes[1], "> @version", "2"
assert_dom dom_nodes[1], "> @lat", "61.0000000"
assert_dom dom_nodes[1], "> @lon", "31.0000000"
end
end
end
##
# test that redacted nodes aren't visible in the history
def test_index_redacted
node = create(:node, :with_history, :version => 2)
node_v1 = node.old_nodes.find_by(:version => 1)
node_v1.redact!(create(:redaction))
get api_node_versions_path(node)
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 0,
"redacted node #{node_v1.node_id} version #{node_v1.version} shouldn't be present in the history."
# not even to a logged-in user
auth_header = bearer_authorization_header
get api_node_versions_path(node), :headers => auth_header
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 0,
"redacted node #{node_v1.node_id} version #{node_v1.version} shouldn't be present in the history, even when logged in."
end
##
# test the version call by submitting several revisions of a new node
# to the API and ensuring that later calls to version return the
@ -191,7 +230,7 @@ module Api
def test_lat_lon_xml_format
old_node = create(:old_node, :latitude => (0.00004 * OldNode::SCALE).to_i, :longitude => (0.00008 * OldNode::SCALE).to_i)
get api_node_history_path(old_node.node_id)
get api_node_versions_path(old_node.node_id)
assert_match(/lat="0.0000400"/, response.body)
assert_match(/lon="0.0000800"/, response.body)
end
@ -279,26 +318,6 @@ module Api
assert_response :forbidden, "Redacted node shouldn't be visible via the version API, even when logged in."
end
##
# test that redacted nodes aren't visible in the history
def test_history_redacted
node = create(:node, :with_history, :version => 2)
node_v1 = node.old_nodes.find_by(:version => 1)
node_v1.redact!(create(:redaction))
get api_node_history_path(node)
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 0,
"redacted node #{node_v1.node_id} version #{node_v1.version} shouldn't be present in the history."
# not even to a logged-in user
auth_header = bearer_authorization_header
get api_node_history_path(node), :headers => auth_header
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 0,
"redacted node #{node_v1.node_id} version #{node_v1.version} shouldn't be present in the history, even when logged in."
end
##
# test the redaction of an old version of a node, while being
# authorised as a moderator.
@ -318,11 +337,11 @@ module Api
assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
# and when accessed via history
get api_node_history_path(node)
get api_node_versions_path(node)
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm node[id='#{node_v3.node_id}'][version='#{node_v3.version}']", 0,
"node #{node_v3.node_id} version #{node_v3.version} should not be present in the history for moderators when not passing flag."
get api_node_history_path(node, :show_redactions => "true"), :headers => auth_header
get api_node_versions_path(node, :show_redactions => "true"), :headers => auth_header
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm node[id='#{node_v3.node_id}'][version='#{node_v3.version}']", 1,
"node #{node_v3.node_id} version #{node_v3.version} should still be present in the history for moderators when passing flag."
@ -346,7 +365,7 @@ module Api
assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
# and when accessed via history
get api_node_history_path(node), :headers => auth_header
get api_node_versions_path(node), :headers => auth_header
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm node[id='#{node_v3.node_id}'][version='#{node_v3.version}']", 0,
"redacted node #{node_v3.node_id} version #{node_v3.version} shouldn't be present in the history."
@ -399,7 +418,7 @@ module Api
assert_response :success, "After unredaction, node should not be gone for moderator."
# and when accessed via history
get api_node_history_path(node)
get api_node_versions_path(node)
assert_response :success, "Unredaction shouldn't have stopped history working."
assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 1,
"node #{node_v1.node_id} version #{node_v1.version} should now be present in the history for moderators without passing flag."
@ -411,7 +430,7 @@ module Api
assert_response :success, "After unredaction, node should be visible to normal users."
# and when accessed via history
get api_node_history_path(node)
get api_node_versions_path(node)
assert_response :success, "Unredaction shouldn't have stopped history working."
assert_select "osm node[id='#{node_v1.node_id}'][version='#{node_v1.version}']", 1,
"node #{node_v1.node_id} version #{node_v1.version} should now be present in the history for normal users without passing flag."

92
test/controllers/api/old_relations_controller_test.rb
View file

@ -7,16 +7,16 @@ module Api
def test_routes
assert_routing(
{ :path => "/api/0.6/relation/1/history", :method => :get },
{ :controller => "api/old_relations", :action => "history", :id => "1" }
{ :controller => "api/old_relations", :action => "index", :relation_id => "1" }
)
assert_routing(
{ :path => "/api/0.6/relation/1/history.json", :method => :get },
{ :controller => "api/old_relations", :action => "index", :relation_id => "1", :format => "json" }
)
assert_routing(
{ :path => "/api/0.6/relation/1/2", :method => :get },
{ :controller => "api/old_relations", :action => "show", :id => "1", :version => "2" }
)
assert_routing(
{ :path => "/api/0.6/relation/1/history.json", :method => :get },
{ :controller => "api/old_relations", :action => "history", :id => "1", :format => "json" }
)
assert_routing(
{ :path => "/api/0.6/relation/1/2.json", :method => :get },
{ :controller => "api/old_relations", :action => "show", :id => "1", :version => "2", :format => "json" }
@ -27,19 +27,52 @@ module Api
)
end
# -------------------------------------
# Test reading old relations.
# -------------------------------------
def test_history
# check that a visible relations is returned properly
get api_relation_history_path(create(:relation, :with_history))
assert_response :success
##
# check that a visible relations is returned properly
def test_index
relation = create(:relation, :with_history, :version => 2)
# check chat a non-existent relations is not returned
get api_relation_history_path(0)
get api_relation_versions_path(relation)
assert_response :success
assert_dom "osm:root", 1 do
assert_dom "> relation", 2 do |dom_relations|
assert_dom dom_relations[0], "> @id", relation.id.to_s
assert_dom dom_relations[0], "> @version", "1"
assert_dom dom_relations[1], "> @id", relation.id.to_s
assert_dom dom_relations[1], "> @version", "2"
end
end
end
##
# check that a non-existent relations is not returned
def test_index_invalid
get api_relation_versions_path(0)
assert_response :not_found
end
##
# test that redacted relations aren't visible in the history
def test_index_redacted
relation = create(:relation, :with_history, :version => 2)
relation_v1 = relation.old_relations.find_by(:version => 1)
relation_v1.redact!(create(:redaction))
get api_relation_versions_path(relation)
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm relation[id='#{relation_v1.relation_id}'][version='#{relation_v1.version}']", 0,
"redacted relation #{relation_v1.relation_id} version #{relation_v1.version} shouldn't be present in the history."
# not even to a logged-in user
auth_header = bearer_authorization_header
get api_relation_versions_path(relation), :headers => auth_header
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm relation[id='#{relation_v1.relation_id}'][version='#{relation_v1.version}']", 0,
"redacted relation #{relation_v1.relation_id} version #{relation_v1.version} shouldn't be present in the history, even when logged in."
end
##
# test the redaction of an old version of a relation, while not being
# authorised.
@ -118,27 +151,6 @@ module Api
assert_response :forbidden, "Redacted relation shouldn't be visible via the version API, even when logged in."
end
##
# test that redacted relations aren't visible in the history
def test_history_redacted
relation = create(:relation, :with_history, :version => 2)
relation_v1 = relation.old_relations.find_by(:version => 1)
relation_v1.redact!(create(:redaction))
get api_relation_history_path(relation)
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm relation[id='#{relation_v1.relation_id}'][version='#{relation_v1.version}']", 0,
"redacted relation #{relation_v1.relation_id} version #{relation_v1.version} shouldn't be present in the history."
# not even to a logged-in user
auth_header = bearer_authorization_header
get api_old_relation_path(relation_v1.relation_id, relation_v1.version), :headers => auth_header
get api_relation_history_path(relation), :headers => auth_header
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm relation[id='#{relation_v1.relation_id}'][version='#{relation_v1.version}']", 0,
"redacted relation #{relation_v1.relation_id} version #{relation_v1.version} shouldn't be present in the history, even when logged in."
end
##
# test the redaction of an old version of a relation, while being
# authorised as a moderator.
@ -159,11 +171,11 @@ module Api
assert_response :success, "After redaction, relation should not be gone for moderator, when flag passed."
# and when accessed via history
get api_relation_history_path(relation), :headers => auth_header
get api_relation_versions_path(relation), :headers => auth_header
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm relation[id='#{relation_v3.relation_id}'][version='#{relation_v3.version}']", 0,
"relation #{relation_v3.relation_id} version #{relation_v3.version} should not be present in the history for moderators when not passing flag."
get api_relation_history_path(relation, :show_redactions => "true"), :headers => auth_header
get api_relation_versions_path(relation, :show_redactions => "true"), :headers => auth_header
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm relation[id='#{relation_v3.relation_id}'][version='#{relation_v3.version}']", 1,
"relation #{relation_v3.relation_id} version #{relation_v3.version} should still be present in the history for moderators when passing flag."
@ -188,7 +200,7 @@ module Api
assert_response :forbidden, "Redacted relation shouldn't be visible via the version API."
# and when accessed via history
get api_relation_history_path(relation), :headers => auth_header
get api_relation_versions_path(relation), :headers => auth_header
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm relation[id='#{relation_v3.relation_id}'][version='#{relation_v3.version}']", 0,
"redacted relation #{relation_v3.relation_id} version #{relation_v3.version} shouldn't be present in the history."
@ -239,7 +251,7 @@ module Api
assert_response :success, "After unredaction, relation should not be gone for moderator."
# and when accessed via history
get api_relation_history_path(relation), :headers => auth_header
get api_relation_versions_path(relation), :headers => auth_header
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm relation[id='#{relation_v1.relation_id}'][version='#{relation_v1.version}']", 1,
"relation #{relation_v1.relation_id} version #{relation_v1.version} should still be present in the history for moderators."
@ -251,7 +263,7 @@ module Api
assert_response :success, "After redaction, node should not be gone for normal user."
# and when accessed via history
get api_relation_history_path(relation), :headers => auth_header
get api_relation_versions_path(relation), :headers => auth_header
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm relation[id='#{relation_v1.relation_id}'][version='#{relation_v1.version}']", 1,
"relation #{relation_v1.relation_id} version #{relation_v1.version} should still be present in the history for normal users."

103
test/controllers/api/old_ways_controller_test.rb
View file

@ -7,16 +7,16 @@ module Api
def test_routes
assert_routing(
{ :path => "/api/0.6/way/1/history", :method => :get },
{ :controller => "api/old_ways", :action => "history", :id => "1" }
{ :controller => "api/old_ways", :action => "index", :way_id => "1" }
)
assert_routing(
{ :path => "/api/0.6/way/1/history.json", :method => :get },
{ :controller => "api/old_ways", :action => "index", :way_id => "1", :format => "json" }
)
assert_routing(
{ :path => "/api/0.6/way/1/2", :method => :get },
{ :controller => "api/old_ways", :action => "show", :id => "1", :version => "2" }
)
assert_routing(
{ :path => "/api/0.6/way/1/history.json", :method => :get },
{ :controller => "api/old_ways", :action => "history", :id => "1", :format => "json" }
)
assert_routing(
{ :path => "/api/0.6/way/1/2.json", :method => :get },
{ :controller => "api/old_ways", :action => "show", :id => "1", :version => "2", :format => "json" }
@ -27,28 +27,59 @@ module Api
)
end
# -------------------------------------
# Test reading old ways.
# -------------------------------------
##
# check that a visible way is returned properly
def test_index
way = create(:way, :with_history, :version => 2)
def test_history_visible
# check that a visible way is returned properly
get api_way_history_path(create(:way, :with_history))
get api_way_versions_path(way)
assert_response :success
assert_dom "osm:root", 1 do
assert_dom "> way", 2 do |dom_ways|
assert_dom dom_ways[0], "> @id", way.id.to_s
assert_dom dom_ways[0], "> @version", "1"
assert_dom dom_ways[1], "> @id", way.id.to_s
assert_dom dom_ways[1], "> @version", "2"
end
end
end
##
# check that an invisible way's history is returned properly
def test_index_invisible
get api_way_versions_path(create(:way, :with_history, :deleted))
assert_response :success
end
def test_history_invisible
# check that an invisible way's history is returned properly
get api_way_history_path(create(:way, :with_history, :deleted))
assert_response :success
end
def test_history_invalid
# check chat a non-existent way is not returned
get api_way_history_path(0)
##
# check chat a non-existent way is not returned
def test_index_invalid
get api_way_versions_path(0)
assert_response :not_found
end
##
# test that redacted ways aren't visible in the history
def test_index_redacted
way = create(:way, :with_history, :version => 2)
way_v1 = way.old_ways.find_by(:version => 1)
way_v1.redact!(create(:redaction))
get api_way_versions_path(way)
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 0,
"redacted way #{way_v1.way_id} version #{way_v1.version} shouldn't be present in the history."
# not even to a logged-in user
auth_header = bearer_authorization_header
get api_way_versions_path(way), :headers => auth_header
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 0,
"redacted node #{way_v1.way_id} version #{way_v1.version} shouldn't be present in the history, even when logged in."
end
##
# check that we can retrieve versions of a way
def test_version
@ -159,26 +190,6 @@ module Api
assert_response :forbidden, "Redacted way shouldn't be visible via the version API, even when logged in."
end
##
# test that redacted ways aren't visible in the history
def test_history_redacted
way = create(:way, :with_history, :version => 2)
way_v1 = way.old_ways.find_by(:version => 1)
way_v1.redact!(create(:redaction))
get api_way_history_path(way)
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 0,
"redacted way #{way_v1.way_id} version #{way_v1.version} shouldn't be present in the history."
# not even to a logged-in user
auth_header = bearer_authorization_header
get api_way_history_path(way), :headers => auth_header
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 0,
"redacted node #{way_v1.way_id} version #{way_v1.version} shouldn't be present in the history, even when logged in."
end
##
# test the redaction of an old version of a way, while being
# authorised as a moderator.
@ -198,11 +209,11 @@ module Api
assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
# and when accessed via history
get api_way_history_path(way), :headers => auth_header
get api_way_versions_path(way), :headers => auth_header
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm way[id='#{way_v3.way_id}'][version='#{way_v3.version}']", 0,
"way #{way_v3.way_id} version #{way_v3.version} should not be present in the history for moderators when not passing flag."
get api_way_history_path(way, :show_redactions => "true"), :headers => auth_header
get api_way_versions_path(way, :show_redactions => "true"), :headers => auth_header
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm way[id='#{way_v3.way_id}'][version='#{way_v3.version}']", 1,
"way #{way_v3.way_id} version #{way_v3.version} should still be present in the history for moderators when passing flag."
@ -226,7 +237,7 @@ module Api
assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
# and when accessed via history
get api_way_history_path(way), :headers => auth_header
get api_way_versions_path(way), :headers => auth_header
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm way[id='#{way_v3.way_id}'][version='#{way_v3.version}']", 0,
"redacted way #{way_v3.way_id} version #{way_v3.version} shouldn't be present in the history."
@ -278,7 +289,7 @@ module Api
assert_response :success, "After unredaction, node should not be gone for moderator."
# and when accessed via history
get api_way_history_path(way), :headers => auth_header
get api_way_versions_path(way), :headers => auth_header
assert_response :success, "Unredaction shouldn't have stopped history working."
assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 1,
"way #{way_v1.way_id} version #{way_v1.version} should still be present in the history for moderators."
@ -290,7 +301,7 @@ module Api
assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
# and when accessed via history
get api_way_history_path(way), :headers => auth_header
get api_way_versions_path(way), :headers => auth_header
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 1,
"way #{way_v1.way_id} version #{way_v1.version} should still be present in the history for normal users."
@ -323,7 +334,7 @@ module Api
# look at all the versions of the way in the history and get each version from
# the versions call. check that they're the same.
def check_history_equals_versions(way_id)
get api_way_history_path(way_id)
get api_way_versions_path(way_id)
assert_response :success, "can't get way #{way_id} from API"
history_doc = XML::Parser.string(@response.body).parse
assert_not_nil history_doc, "parsing way #{way_id} history failed"