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

Simplify element history paths in api tests

Browse source
This commit is contained in:
Anton Khorev 2024-04-02 15:28:49 +03:00
parent 0e50ff563e
commit c073acf5b7
3 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -191,7 +191,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(:id => old_node.node_id, :version => old_node.version)
get api_node_history_path(old_node.node_id)
assert_match(/lat="0.0000400"/, response.body)
assert_match(/lon="0.0000800"/, response.body)
end
@ -299,14 +299,14 @@ module Api
node_v1 = node.old_nodes.find_by(:version => 1)
node_v1.redact!(create(:redaction))
get api_node_history_path(:id => node_v1.node_id)
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 = basic_authorization_header create(:user).email, "test"
get api_node_history_path(:id => node_v1.node_id), :headers => auth_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."
@ -331,11 +331,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(:id => node_v3.node_id)
get api_node_history_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(:id => node_v3.node_id), :params => { :show_redactions => "true" }, :headers => auth_header
get api_node_history_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."
@ -359,7 +359,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(:id => node_v3.node_id), :headers => auth_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_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."
@ -412,7 +412,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(:id => node_v1.node_id)
get api_node_history_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."
@ -424,7 +424,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(:id => node_v1.node_id)
get api_node_history_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."

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

@ -36,7 +36,7 @@ module Api
assert_response :success
# check chat a non-existent relations is not returned
get api_relation_history_path(:id => 0)
get api_relation_history_path(0)
assert_response :not_found
end
@ -138,7 +138,7 @@ module Api
relation_v1 = relation.old_relations.find_by(:version => 1)
relation_v1.redact!(create(:redaction))
get api_relation_history_path(:id => relation_v1.relation_id)
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."
@ -146,7 +146,7 @@ module Api
# not even to a logged-in user
auth_header = basic_authorization_header create(:user).email, "test"
get api_old_relation_path(relation_v1.relation_id, relation_v1.version), :headers => auth_header
get api_relation_history_path(:id => relation_v1.relation_id), :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."
@ -172,11 +172,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(:id => relation_v3.relation_id), :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_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(:id => relation_v3.relation_id), :params => { :show_redactions => "true" }, :headers => auth_header
get api_relation_history_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."
@ -201,7 +201,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(:id => relation_v3.relation_id), :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_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."
@ -252,7 +252,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(:id => relation_v1.relation_id), :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}']", 1,
"relation #{relation_v1.relation_id} version #{relation_v1.version} should still be present in the history for moderators."
@ -264,7 +264,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(:id => relation_v1.relation_id), :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}']", 1,
"relation #{relation_v1.relation_id} version #{relation_v1.version} should still be present in the history for normal users."

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

@ -45,7 +45,7 @@ module Api
def test_history_invalid
# check chat a non-existent way is not returned
get api_way_history_path(:id => 0)
get api_way_history_path(0)
assert_response :not_found
end
@ -179,14 +179,14 @@ module Api
way_v1 = way.old_ways.find_by(:version => 1)
way_v1.redact!(create(:redaction))
get api_way_history_path(:id => way_v1.way_id)
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 = basic_authorization_header create(:user).email, "test"
get api_way_history_path(:id => way_v1.way_id), :headers => auth_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."
@ -211,11 +211,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(:id => way_v3.way_id), :headers => auth_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_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(:id => way_v3.way_id), :params => { :show_redactions => "true" }, :headers => auth_header
get api_way_history_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."
@ -239,7 +239,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(:id => way_v3.way_id), :headers => auth_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_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."
@ -291,7 +291,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(:id => way_v1.way_id), :headers => auth_header
get api_way_history_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."
@ -303,7 +303,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(:id => way_v1.way_id), :headers => auth_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}']", 1,
"way #{way_v1.way_id} version #{way_v1.version} should still be present in the history for normal users."
@ -336,7 +336,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(:id => way_id)
get api_way_history_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"