From 319c9af97553f2a37d10097bf1017740ebfdbf12 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Tue, 11 Feb 2025 05:41:18 +0300 Subject: [PATCH] Move current version redaction tests above roles/scopes tests --- .../api/old_nodes_controller_test.rb | 26 +++++++++---------- .../api/old_relations_controller_test.rb | 26 +++++++++---------- .../api/old_ways_controller_test.rb | 26 +++++++++---------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/test/controllers/api/old_nodes_controller_test.rb b/test/controllers/api/old_nodes_controller_test.rb index fb1ee16bc..7bea5d9d3 100644 --- a/test/controllers/api/old_nodes_controller_test.rb +++ b/test/controllers/api/old_nodes_controller_test.rb @@ -194,31 +194,31 @@ module Api end ## - # test the redaction of an old version of a node, while not being - # authorised. - def test_redact_node_unauthorised + # test that, even as moderator, the current version of a node + # can't be redacted. + def test_redact_node_current_version node = create(:node, :with_history, :version => 2) - old_node = node.old_nodes.find_by(:version => 1) + old_node = node.old_nodes.find_by(:version => 2) redaction = create(:redaction) + auth_header = bearer_authorization_header create(:moderator_user) - post node_version_redact_path(*old_node.id), :params => { :redaction => redaction.id } + post node_version_redact_path(*old_node.id), :params => { :redaction => redaction.id }, :headers => auth_header - assert_response :unauthorized, "should need to be authenticated to redact." + assert_response :bad_request, "shouldn't be OK to redact current version as moderator." assert_nil old_node.reload.redaction end ## - # test that, even as moderator, the current version of a node - # can't be redacted. - def test_redact_node_current_version + # test the redaction of an old version of a node, while not being + # authorised. + def test_redact_node_unauthorised node = create(:node, :with_history, :version => 2) - old_node = node.old_nodes.find_by(:version => 2) + old_node = node.old_nodes.find_by(:version => 1) redaction = create(:redaction) - auth_header = bearer_authorization_header create(:moderator_user) - post node_version_redact_path(*old_node.id), :params => { :redaction => redaction.id }, :headers => auth_header + post node_version_redact_path(*old_node.id), :params => { :redaction => redaction.id } - assert_response :bad_request, "shouldn't be OK to redact current version as moderator." + assert_response :unauthorized, "should need to be authenticated to redact." assert_nil old_node.reload.redaction end diff --git a/test/controllers/api/old_relations_controller_test.rb b/test/controllers/api/old_relations_controller_test.rb index ecd9107b4..603499503 100644 --- a/test/controllers/api/old_relations_controller_test.rb +++ b/test/controllers/api/old_relations_controller_test.rb @@ -185,31 +185,31 @@ module Api end ## - # test the redaction of an old version of a relation, while not being - # authorised. - def test_redact_relation_unauthorised + # test that, even as moderator, the current version of a relation + # can't be redacted. + def test_redact_relation_current_version relation = create(:relation, :with_history, :version => 2) - old_relation = relation.old_relations.find_by(:version => 1) + old_relation = relation.old_relations.find_by(:version => 2) redaction = create(:redaction) + auth_header = bearer_authorization_header create(:moderator_user) - post relation_version_redact_path(*old_relation.id), :params => { :redaction => redaction.id } + post relation_version_redact_path(*old_relation.id), :params => { :redaction => redaction.id }, :headers => auth_header - assert_response :unauthorized, "should need to be authenticated to redact." + assert_response :bad_request, "shouldn't be OK to redact current version as moderator." assert_nil old_relation.reload.redaction end ## - # test that, even as moderator, the current version of a relation - # can't be redacted. - def test_redact_relation_current_version + # test the redaction of an old version of a relation, while not being + # authorised. + def test_redact_relation_unauthorised relation = create(:relation, :with_history, :version => 2) - old_relation = relation.old_relations.find_by(:version => 2) + old_relation = relation.old_relations.find_by(:version => 1) redaction = create(:redaction) - auth_header = bearer_authorization_header create(:moderator_user) - post relation_version_redact_path(*old_relation.id), :params => { :redaction => redaction.id }, :headers => auth_header + post relation_version_redact_path(*old_relation.id), :params => { :redaction => redaction.id } - assert_response :bad_request, "shouldn't be OK to redact current version as moderator." + assert_response :unauthorized, "should need to be authenticated to redact." assert_nil old_relation.reload.redaction end diff --git a/test/controllers/api/old_ways_controller_test.rb b/test/controllers/api/old_ways_controller_test.rb index d695311fc..e879c42a9 100644 --- a/test/controllers/api/old_ways_controller_test.rb +++ b/test/controllers/api/old_ways_controller_test.rb @@ -196,31 +196,31 @@ module Api end ## - # test the redaction of an old version of a way, while not being - # authorised. - def test_redact_way_unauthorised + # test that, even as moderator, the current version of a way + # can't be redacted. + def test_redact_way_current_version way = create(:way, :with_history, :version => 2) - old_way = way.old_ways.find_by(:version => 1) + old_way = way.old_ways.find_by(:version => 2) redaction = create(:redaction) + auth_header = bearer_authorization_header create(:moderator_user) - post way_version_redact_path(*old_way.id), :params => { :redaction => redaction.id } + post way_version_redact_path(*old_way.id), :params => { :redaction => redaction.id }, :headers => auth_header - assert_response :unauthorized, "should need to be authenticated to redact." + assert_response :bad_request, "shouldn't be OK to redact current version as moderator." assert_nil old_way.reload.redaction end ## - # test that, even as moderator, the current version of a way - # can't be redacted. - def test_redact_way_current_version + # test the redaction of an old version of a way, while not being + # authorised. + def test_redact_way_unauthorised way = create(:way, :with_history, :version => 2) - old_way = way.old_ways.find_by(:version => 2) + old_way = way.old_ways.find_by(:version => 1) redaction = create(:redaction) - auth_header = bearer_authorization_header create(:moderator_user) - post way_version_redact_path(*old_way.id), :params => { :redaction => redaction.id }, :headers => auth_header + post way_version_redact_path(*old_way.id), :params => { :redaction => redaction.id } - assert_response :bad_request, "shouldn't be OK to redact current version as moderator." + assert_response :unauthorized, "should need to be authenticated to redact." assert_nil old_way.reload.redaction end -- 2.39.5