X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c134cabab2ce6d88113c15b7e5d166b189030df0..06cca3717a91dcc089205bda5aab30c0f10ba582:/test/controllers/api/old_nodes_controller_test.rb diff --git a/test/controllers/api/old_nodes_controller_test.rb b/test/controllers/api/old_nodes_controller_test.rb index 9aa6fdce9..04e76dac5 100644 --- a/test/controllers/api/old_nodes_controller_test.rb +++ b/test/controllers/api/old_nodes_controller_test.rb @@ -213,11 +213,11 @@ module Api # 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 => 4) + node = create(:node, :with_history, :version => 2) redaction = create(:redaction) auth_header = bearer_authorization_header create(:moderator_user) - post node_version_redact_path(node, 4), :params => { :redaction => redaction.id }, :headers => auth_header + post node_version_redact_path(node, 2), :params => { :redaction => redaction.id }, :headers => auth_header assert_response :bad_request, "shouldn't be OK to redact current version as moderator." end @@ -250,17 +250,17 @@ module Api # test the redaction of an old version of a node, while being # authorised as a moderator. def test_redact_node_moderator - node = create(:node, :with_history, :version => 4) - node_v3 = node.old_nodes.find_by(:version => 3) + node = create(:node, :with_history, :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(*node_v3.id), :params => { :redaction => redaction.id }, :headers => auth_header + post node_version_redact_path(*old_node.id), :params => { :redaction => redaction.id }, :headers => auth_header assert_response :success, "should be OK to redact old version as moderator." - node_v3.reload - assert_predicate node_v3, :redacted? - assert_equal redaction, node_v3.redaction + old_node.reload + assert_predicate old_node, :redacted? + assert_equal redaction, old_node.redaction end ## @@ -268,11 +268,14 @@ module Api # authorised. def test_unredact_node_unauthorised node = create(:node, :with_history, :version => 2) - node_v1 = node.old_nodes.find_by(:version => 1) - node_v1.redact!(create(:redaction)) + old_node = node.old_nodes.find_by(:version => 1) + redaction = create(:redaction) + old_node.redact!(redaction) + + post node_version_redact_path(*old_node.id) - post node_version_redact_path(node_v1.node_id, node_v1.version) assert_response :unauthorized, "should need to be authenticated to unredact." + assert_equal redaction, old_node.reload.redaction end ## @@ -281,13 +284,15 @@ module Api def test_unredact_node_normal_user user = create(:user) node = create(:node, :with_history, :version => 2) - node_v1 = node.old_nodes.find_by(:version => 1) - node_v1.redact!(create(:redaction)) - + old_node = node.old_nodes.find_by(:version => 1) + redaction = create(:redaction) + old_node.redact!(redaction) auth_header = bearer_authorization_header user - post node_version_redact_path(node_v1.node_id, node_v1.version), :headers => auth_header + post node_version_redact_path(*old_node.id), :headers => auth_header + assert_response :forbidden, "should need to be moderator to unredact." + assert_equal redaction, old_node.reload.redaction end ## @@ -296,45 +301,23 @@ module Api def test_unredact_node_moderator moderator_user = create(:moderator_user) node = create(:node, :with_history, :version => 2) - node_v1 = node.old_nodes.find_by(:version => 1) - node_v1.redact!(create(:redaction)) - + old_node = node.old_nodes.find_by(:version => 1) + old_node.redact!(create(:redaction)) auth_header = bearer_authorization_header moderator_user - 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." + post node_version_redact_path(*old_node.id), :headers => auth_header - # check moderator can now see the redacted data, when not - # passing the aspecial flag - get api_node_version_path(node_v1.node_id, node_v1.version), :headers => auth_header - assert_response :success, "After unredaction, node should not be gone for moderator." - - # and when accessed via history - get api_node_versions_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." - - auth_header = bearer_authorization_header - - # check normal user can now see the redacted data - get api_node_version_path(node_v1.node_id, node_v1.version), :headers => auth_header - assert_response :success, "After unredaction, node should be visible to normal users." - - # and when accessed via history - get api_node_versions_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." + assert_response :success, "should be OK to unredact old version as moderator." + assert_nil old_node.reload.redaction end private def do_redact_redactable_node(headers = {}) - node = create(:node, :with_history, :version => 4) + node = create(:node, :with_history, :version => 2) redaction = create(:redaction) - post node_version_redact_path(node, 3), :params => { :redaction => redaction.id }, :headers => headers + post node_version_redact_path(node, 1), :params => { :redaction => redaction.id }, :headers => headers end def check_not_found_id_version(id, version)