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 | 28 +++++++++---------- .../api/old_relations_controller_test.rb | 28 +++++++++---------- .../api/old_ways_controller_test.rb | 28 +++++++++---------- 3 files changed, 42 insertions(+), 42 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 @@ -193,20 +193,6 @@ module Api assert_match(/lon="0.0000800"/, response.body) end - ## - # 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 => 1) - redaction = create(:redaction) - - post node_version_redact_path(*old_node.id), :params => { :redaction => redaction.id } - - assert_response :unauthorized, "should need to be authenticated to redact." - assert_nil old_node.reload.redaction - end - ## # test that, even as moderator, the current version of a node # can't be redacted. @@ -222,6 +208,20 @@ module Api assert_nil old_node.reload.redaction end + ## + # 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 => 1) + redaction = create(:redaction) + + post node_version_redact_path(*old_node.id), :params => { :redaction => redaction.id } + + assert_response :unauthorized, "should need to be authenticated to redact." + assert_nil old_node.reload.redaction + end + def test_redact_node_by_regular_without_write_redactions_scope node = create(:node, :with_history, :version => 2) old_node = node.old_nodes.find_by(:version => 1) 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 @@ -184,20 +184,6 @@ module Api assert_response :success, "Redacted relation should not be gone for moderator, when flag passed." end - ## - # 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 => 1) - redaction = create(:redaction) - - post relation_version_redact_path(*old_relation.id), :params => { :redaction => redaction.id } - - assert_response :unauthorized, "should need to be authenticated to redact." - assert_nil old_relation.reload.redaction - end - ## # test that, even as moderator, the current version of a relation # can't be redacted. @@ -213,6 +199,20 @@ module Api assert_nil old_relation.reload.redaction end + ## + # 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 => 1) + redaction = create(:redaction) + + post relation_version_redact_path(*old_relation.id), :params => { :redaction => redaction.id } + + assert_response :unauthorized, "should need to be authenticated to redact." + assert_nil old_relation.reload.redaction + end + def test_redact_relation_by_regular_without_write_redactions_scope relation = create(:relation, :with_history, :version => 2) old_relation = relation.old_relations.find_by(:version => 1) 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 @@ -195,20 +195,6 @@ module Api check_history_equals_versions(way_with_versions.id) end - ## - # 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 => 1) - redaction = create(:redaction) - - post way_version_redact_path(*old_way.id), :params => { :redaction => redaction.id } - - assert_response :unauthorized, "should need to be authenticated to redact." - assert_nil old_way.reload.redaction - end - ## # test that, even as moderator, the current version of a way # can't be redacted. @@ -224,6 +210,20 @@ module Api assert_nil old_way.reload.redaction end + ## + # 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 => 1) + redaction = create(:redaction) + + post way_version_redact_path(*old_way.id), :params => { :redaction => redaction.id } + + assert_response :unauthorized, "should need to be authenticated to redact." + assert_nil old_way.reload.redaction + end + def test_redact_way_by_regular_without_write_redactions_scope way = create(:way, :with_history, :version => 2) old_way = way.old_ways.find_by(:version => 1)