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

Rename api element version path helper

Browse source
This commit is contained in:
Anton Khorev 2024-03-03 13:13:26 +03:00
parent cbf6b39464
commit ad96da4518
8 changed files with 54 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -142,7 +142,7 @@ module Api
# check all the versions
versions.each_key do |key|
get node_version_path(:id => nodeid, :version => key.to_i)
get api_old_node_path(:id => nodeid, :version => key.to_i)
assert_response :success,
"couldn't get version #{key.to_i} of node #{nodeid}"
@ -283,12 +283,12 @@ module Api
node_v1 = node.old_nodes.find_by(:version => 1)
node_v1.redact!(create(:redaction))
get node_version_path(:id => node_v1.node_id, :version => node_v1.version)
get api_old_node_path(:id => node_v1.node_id, :version => node_v1.version)
assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
# not even to a logged-in user
auth_header = basic_authorization_header create(:user).email, "test"
get node_version_path(:id => node_v1.node_id, :version => node_v1.version), :headers => auth_header
get api_old_node_path(:id => node_v1.node_id, :version => node_v1.version), :headers => auth_header
assert_response :forbidden, "Redacted node shouldn't be visible via the version API, even when logged in."
end
@ -325,9 +325,9 @@ module Api
# check moderator can still see the redacted data, when passing
# the appropriate flag
get node_version_path(:id => node_v3.node_id, :version => node_v3.version), :headers => auth_header
get api_old_node_path(:id => node_v3.node_id, :version => node_v3.version), :headers => auth_header
assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed."
get node_version_path(:id => node_v3.node_id, :version => node_v3.version), :params => { :show_redactions => "true" }, :headers => auth_header
get api_old_node_path(:id => node_v3.node_id, :version => node_v3.version), :params => { :show_redactions => "true" }, :headers => auth_header
assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
# and when accessed via history
@ -355,7 +355,7 @@ module Api
auth_header = basic_authorization_header create(:user).email, "test"
# check can't see the redacted data
get node_version_path(:id => node_v3.node_id, :version => node_v3.version), :headers => auth_header
get api_old_node_path(:id => node_v3.node_id, :version => node_v3.version), :headers => auth_header
assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
# and when accessed via history
@ -408,7 +408,7 @@ module Api
# check moderator can now see the redacted data, when not
# passing the aspecial flag
get node_version_path(:id => node_v1.node_id, :version => node_v1.version), :headers => auth_header
get api_old_node_path(:id => node_v1.node_id, :version => node_v1.version), :headers => auth_header
assert_response :success, "After unredaction, node should not be gone for moderator."
# and when accessed via history
@ -420,7 +420,7 @@ module Api
auth_header = basic_authorization_header create(:user).email, "test"
# check normal user can now see the redacted data
get node_version_path(:id => node_v1.node_id, :version => node_v1.version), :headers => auth_header
get api_old_node_path(:id => node_v1.node_id, :version => node_v1.version), :headers => auth_header
assert_response :success, "After unredaction, node should be visible to normal users."
# and when accessed via history
@ -446,7 +446,7 @@ module Api
end
def do_redact_node(node, redaction, headers = {})
get node_version_path(:id => node.node_id, :version => node.version), :headers => headers
get api_old_node_path(:id => node.node_id, :version => node.version), :headers => headers
assert_response :success, "should be able to get version #{node.version} of node #{node.node_id}."
# now redact it
@ -463,7 +463,7 @@ module Api
assert_not_nil current_node, "getting node #{node_id} returned nil"
# get the "old" version of the node from the old_node interface
get node_version_path(:id => node_id, :version => current_node.version)
get api_old_node_path(:id => node_id, :version => current_node.version)
assert_response :success, "cant get old node #{node_id}, v#{current_node.version}"
old_node = Node.from_xml(@response.body)
@ -472,7 +472,7 @@ module Api
end
def check_not_found_id_version(id, version)
get node_version_path(:id => id, :version => version)
get api_old_node_path(:id => id, :version => version)
assert_response :not_found
rescue ActionController::UrlGenerationError => e
assert_match(/No route matches/, e.to_s)

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

@ -122,12 +122,12 @@ module Api
relation_v1 = relation.old_relations.find_by(:version => 1)
relation_v1.redact!(create(:redaction))
get relation_version_path(:id => relation_v1.relation_id, :version => relation_v1.version)
get api_old_relation_path(:id => relation_v1.relation_id, :version => relation_v1.version)
assert_response :forbidden, "Redacted relation shouldn't be visible via the version API."
# not even to a logged-in user
auth_header = basic_authorization_header create(:user).email, "test"
get relation_version_path(:id => relation_v1.relation_id, :version => relation_v1.version), :headers => auth_header
get api_old_relation_path(:id => relation_v1.relation_id, :version => relation_v1.version), :headers => auth_header
assert_response :forbidden, "Redacted relation shouldn't be visible via the version API, even when logged in."
end
@ -145,7 +145,7 @@ module Api
# not even to a logged-in user
auth_header = basic_authorization_header create(:user).email, "test"
get relation_version_path(:id => relation_v1.relation_id, :version => relation_v1.version), :headers => auth_header
get api_old_relation_path(:id => relation_v1.relation_id, :version => relation_v1.version), :headers => auth_header
get api_relation_history_path(:id => relation_v1.relation_id), :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,
@ -166,9 +166,9 @@ module Api
# check moderator can still see the redacted data, when passing
# the appropriate flag
get relation_version_path(:id => relation_v3.relation_id, :version => relation_v3.version), :headers => auth_header
get api_old_relation_path(:id => relation_v3.relation_id, :version => relation_v3.version), :headers => auth_header
assert_response :forbidden, "After redaction, relation should be gone for moderator, when flag not passed."
get relation_version_path(:id => relation_v3.relation_id, :version => relation_v3.version), :params => { :show_redactions => "true" }, :headers => auth_header
get api_old_relation_path(:id => relation_v3.relation_id, :version => relation_v3.version), :params => { :show_redactions => "true" }, :headers => auth_header
assert_response :success, "After redaction, relation should not be gone for moderator, when flag passed."
# and when accessed via history
@ -197,7 +197,7 @@ module Api
auth_header = basic_authorization_header create(:user).email, "test"
# check can't see the redacted data
get relation_version_path(:id => relation_v3.relation_id, :version => relation_v3.version), :headers => auth_header
get api_old_relation_path(:id => relation_v3.relation_id, :version => relation_v3.version), :headers => auth_header
assert_response :forbidden, "Redacted relation shouldn't be visible via the version API."
# and when accessed via history
@ -248,7 +248,7 @@ module Api
# check moderator can still see the redacted data, without passing
# the appropriate flag
get relation_version_path(:id => relation_v1.relation_id, :version => relation_v1.version), :headers => auth_header
get api_old_relation_path(:id => relation_v1.relation_id, :version => relation_v1.version), :headers => auth_header
assert_response :success, "After unredaction, relation should not be gone for moderator."
# and when accessed via history
@ -260,7 +260,7 @@ module Api
auth_header = basic_authorization_header create(:user).email, "test"
# check normal user can now see the redacted data
get relation_version_path(:id => relation_v1.relation_id, :version => relation_v1.version), :headers => auth_header
get api_old_relation_path(:id => relation_v1.relation_id, :version => relation_v1.version), :headers => auth_header
assert_response :success, "After redaction, node should not be gone for normal user."
# and when accessed via history
@ -329,7 +329,7 @@ module Api
end
def do_redact_relation(relation, redaction, headers = {})
get relation_version_path(:id => relation.relation_id, :version => relation.version)
get api_old_relation_path(:id => relation.relation_id, :version => relation.version)
assert_response :success, "should be able to get version #{relation.version} of relation #{relation.relation_id}."
# now redact it

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

@ -163,12 +163,12 @@ module Api
way_v1 = way.old_ways.find_by(:version => 1)
way_v1.redact!(create(:redaction))
get way_version_path(:id => way_v1.way_id, :version => way_v1.version)
get api_old_way_path(:id => way_v1.way_id, :version => way_v1.version)
assert_response :forbidden, "Redacted way shouldn't be visible via the version API."
# not even to a logged-in user
auth_header = basic_authorization_header create(:user).email, "test"
get way_version_path(:id => way_v1.way_id, :version => way_v1.version), :headers => auth_header
get api_old_way_path(:id => way_v1.way_id, :version => way_v1.version), :headers => auth_header
assert_response :forbidden, "Redacted way shouldn't be visible via the version API, even when logged in."
end
@ -186,7 +186,6 @@ module Api
# not even to a logged-in user
auth_header = basic_authorization_header create(:user).email, "test"
get way_version_path(:id => way_v1.way_id, :version => way_v1.version), :headers => auth_header
get api_way_history_path(:id => way_v1.way_id), :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,
@ -206,9 +205,9 @@ module Api
# check moderator can still see the redacted data, when passing
# the appropriate flag
get way_version_path(:id => way_v3.way_id, :version => way_v3.version), :headers => auth_header
get api_old_way_path(:id => way_v3.way_id, :version => way_v3.version), :headers => auth_header
assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed."
get way_version_path(:id => way_v3.way_id, :version => way_v3.version), :params => { :show_redactions => "true" }, :headers => auth_header
get api_old_way_path(:id => way_v3.way_id, :version => way_v3.version), :params => { :show_redactions => "true" }, :headers => auth_header
assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
# and when accessed via history
@ -236,7 +235,7 @@ module Api
auth_header = basic_authorization_header create(:user).email, "test"
# check can't see the redacted data
get way_version_path(:id => way_v3.way_id, :version => way_v3.version), :headers => auth_header
get api_old_way_path(:id => way_v3.way_id, :version => way_v3.version), :headers => auth_header
assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
# and when accessed via history
@ -288,7 +287,7 @@ module Api
# check moderator can still see the unredacted data, without passing
# the appropriate flag
get way_version_path(:id => way_v1.way_id, :version => way_v1.version), :headers => auth_header
get api_old_way_path(:id => way_v1.way_id, :version => way_v1.version), :headers => auth_header
assert_response :success, "After unredaction, node should not be gone for moderator."
# and when accessed via history
@ -300,7 +299,7 @@ module Api
auth_header = basic_authorization_header create(:user).email, "test"
# check normal user can now see the unredacted data
get way_version_path(:id => way_v1.way_id, :version => way_v1.version), :headers => auth_header
get api_old_way_path(:id => way_v1.way_id, :version => way_v1.version), :headers => auth_header
assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
# and when accessed via history
@ -325,7 +324,7 @@ module Api
assert_not_nil current_way, "getting way #{way_id} returned nil"
# get the "old" version of the way from the version method
get way_version_path(:id => way_id, :version => current_way.version)
get api_old_way_path(:id => way_id, :version => current_way.version)
assert_response :success, "can't get old way #{way_id}, v#{current_way.version}"
old_way = Way.from_xml(@response.body)
@ -346,7 +345,7 @@ module Api
history_way = Way.from_xml_node(way_doc)
assert_not_nil history_way, "parsing way #{way_id} version failed"
get way_version_path(:id => way_id, :version => history_way.version)
get api_old_way_path(:id => way_id, :version => history_way.version)
assert_response :success, "couldn't get way #{way_id}, v#{history_way.version}"
version_way = Way.from_xml(@response.body)
assert_not_nil version_way, "failed to parse #{way_id}, v#{history_way.version}"
@ -369,7 +368,7 @@ module Api
end
def do_redact_way(way, redaction, headers = {})
get way_version_path(:id => way.way_id, :version => way.version)
get api_old_way_path(:id => way.way_id, :version => way.version)
assert_response :success, "should be able to get version #{way.version} of way #{way.way_id}."
# now redact it

6
test/controllers/api/relations_controller_test.rb
View file

@ -788,7 +788,7 @@ module Api
# check the ordering in the history tables:
with_controller(OldRelationsController.new) do
get relation_version_path(:id => relation_id, :version => 2)
get api_old_relation_path(:id => relation_id, :version => 2)
assert_response :success, "can't read back version 2 of the relation #{relation_id}"
check_ordering(doc, @response.body)
end
@ -868,7 +868,7 @@ module Api
# check the ordering in the history tables:
with_controller(OldRelationsController.new) do
get relation_version_path(:id => relation_id, :version => 1)
get api_old_relation_path(:id => relation_id, :version => 1)
assert_response :success, "can't read back version 1 of the relation: #{@response.body}"
check_ordering(doc, @response.body)
end
@ -1109,7 +1109,7 @@ module Api
get api_relation_path(:id => id)
else
with_controller(OldRelationsController.new) do
get relation_version_path(:id => id, :version => ver)
get api_old_relation_path(:id => id, :version => ver)
end
end
assert_response :success