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

Simplify redact element paths in api tests

Browse source
This commit is contained in:
Anton Khorev 2024-04-02 15:49:40 +03:00
parent c073acf5b7
commit 2f53c2520d
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -373,7 +373,7 @@ module Api
node_v1 = node.old_nodes.find_by(:version => 1)
node_v1.redact!(create(:redaction))
post node_version_redact_path(:id => node_v1.node_id, :version => node_v1.version)
post node_version_redact_path(node_v1.node_id, node_v1.version)
assert_response :unauthorized, "should need to be authenticated to unredact."
end
@ -388,7 +388,7 @@ module Api
auth_header = basic_authorization_header user.email, "test"
post node_version_redact_path(:id => node_v1.node_id, :version => node_v1.version), :headers => auth_header
post node_version_redact_path(node_v1.node_id, node_v1.version), :headers => auth_header
assert_response :forbidden, "should need to be moderator to unredact."
end
@ -403,7 +403,7 @@ module Api
auth_header = basic_authorization_header moderator_user.email, "test"
post node_version_redact_path(:id => node_v1.node_id, :version => node_v1.version), :headers => auth_header
post node_version_redact_path(node_v1.node_id, node_v1.version), :headers => auth_header
assert_response :success, "should be OK to unredact old version as moderator."
# check moderator can now see the redacted data, when not
@ -450,7 +450,7 @@ module Api
assert_response :success, "should be able to get version #{node.version} of node #{node.node_id}."
# now redact it
post node_version_redact_path(:id => node.node_id, :version => node.version), :params => { :redaction => redaction.id }, :headers => headers
post node_version_redact_path(node.node_id, node.version), :params => { :redaction => redaction.id }, :headers => headers
end
def check_current_version(node_id)

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

@ -215,7 +215,7 @@ module Api
relation_v1 = relation.old_relations.find_by(:version => 1)
relation_v1.redact!(create(:redaction))
post relation_version_redact_path(:id => relation_v1.relation_id, :version => relation_v1.version)
post relation_version_redact_path(relation_v1.relation_id, relation_v1.version)
assert_response :unauthorized, "should need to be authenticated to unredact."
end
@ -229,7 +229,7 @@ module Api
auth_header = basic_authorization_header create(:user).email, "test"
post relation_version_redact_path(:id => relation_v1.relation_id, :version => relation_v1.version), :headers => auth_header
post relation_version_redact_path(relation_v1.relation_id, relation_v1.version), :headers => auth_header
assert_response :forbidden, "should need to be moderator to unredact."
end
@ -243,7 +243,7 @@ module Api
auth_header = basic_authorization_header create(:moderator_user).email, "test"
post relation_version_redact_path(:id => relation_v1.relation_id, :version => relation_v1.version), :headers => auth_header
post relation_version_redact_path(relation_v1.relation_id, relation_v1.version), :headers => auth_header
assert_response :success, "should be OK to unredact old version as moderator."
# check moderator can still see the redacted data, without passing
@ -333,7 +333,7 @@ module Api
assert_response :success, "should be able to get version #{relation.version} of relation #{relation.relation_id}."
# now redact it
post relation_version_redact_path(:id => relation.relation_id, :version => relation.version), :params => { :redaction => redaction.id }, :headers => headers
post relation_version_redact_path(relation.relation_id, relation.version), :params => { :redaction => redaction.id }, :headers => headers
end
end
end

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

@ -253,7 +253,7 @@ module Api
way_v1 = way.old_ways.find_by(:version => 1)
way_v1.redact!(create(:redaction))
post way_version_redact_path(:id => way_v1.way_id, :version => way_v1.version)
post way_version_redact_path(way_v1.way_id, way_v1.version)
assert_response :unauthorized, "should need to be authenticated to unredact."
end
@ -267,7 +267,7 @@ module Api
auth_header = basic_authorization_header create(:user).email, "test"
post way_version_redact_path(:id => way_v1.way_id, :version => way_v1.version), :headers => auth_header
post way_version_redact_path(way_v1.way_id, way_v1.version), :headers => auth_header
assert_response :forbidden, "should need to be moderator to unredact."
end
@ -282,7 +282,7 @@ module Api
auth_header = basic_authorization_header moderator_user.email, "test"
post way_version_redact_path(:id => way_v1.way_id, :version => way_v1.version), :headers => auth_header
post way_version_redact_path(way_v1.way_id, way_v1.version), :headers => auth_header
assert_response :success, "should be OK to unredact old version as moderator."
# check moderator can still see the unredacted data, without passing
@ -372,7 +372,7 @@ module Api
assert_response :success, "should be able to get version #{way.version} of way #{way.way_id}."
# now redact it
post way_version_redact_path(:id => way.way_id, :version => way.version), :params => { :redaction => redaction.id }, :headers => headers
post way_version_redact_path(way.way_id, way.version), :params => { :redaction => redaction.id }, :headers => headers
end
def propagate_tags(way, old_way)