X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1da870fd48127e7fafc59a1c59268c549ba724a3..984dd624dd27140ea554c305117fd5a175a595a2:/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 b01d768e1..312bae5dd 100644 --- a/test/controllers/api/old_nodes_controller_test.rb +++ b/test/controllers/api/old_nodes_controller_test.rb @@ -21,10 +21,6 @@ module Api { :path => "/api/0.6/node/1/2.json", :method => :get }, { :controller => "api/old_nodes", :action => "show", :node_id => "1", :version => "2", :format => "json" } ) - assert_routing( - { :path => "/api/0.6/node/1/2/redact", :method => :post }, - { :controller => "api/old_nodes", :action => "redact", :node_id => "1", :version => "2" } - ) end def test_index @@ -52,259 +48,149 @@ module Api ## # test that redacted nodes aren't visible in the history - def test_index_redacted + def test_index_redacted_unauthorised node = create(:node, :with_history, :version => 2) - node_v1 = node.old_nodes.find_by(:version => 1) - node_v1.redact!(create(:redaction)) + node.old_nodes.find_by(:version => 1).redact!(create(:redaction)) get api_node_versions_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 = bearer_authorization_header - get api_node_versions_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." - end + assert_dom "osm node[id='#{node.id}'][version='1']", 0, + "redacted node #{node.id} version 1 shouldn't be present in the history." - # TODO: test_show + get api_node_versions_path(node, :show_redactions => "true") - def test_show_not_found - check_not_found_id_version(70000, 312344) - check_not_found_id_version(-1, -13) - check_not_found_id_version(create(:node).id, 24354) - check_not_found_id_version(24356, create(:node).version) + assert_response :success, "Redaction shouldn't have stopped history working." + assert_dom "osm node[id='#{node.id}'][version='1']", 0, + "redacted node #{node.id} version 1 shouldn't be present in the history when passing flag." end - ## - # test that redacted nodes aren't visible, regardless of - # authorisation except as moderator... - def test_show_redacted + def test_index_redacted_normal_user node = create(:node, :with_history, :version => 2) - node_v1 = node.old_nodes.find_by(:version => 1) - node_v1.redact!(create(:redaction)) - - get api_node_version_path(node_v1.node_id, node_v1.version) - assert_response :forbidden, "Redacted node shouldn't be visible via the version API." - - # not even to a logged-in user - auth_header = bearer_authorization_header - get api_node_version_path(node_v1.node_id, node_v1.version), :headers => auth_header - assert_response :forbidden, "Redacted node shouldn't be visible via the version API, even when logged in." - end + node.old_nodes.find_by(:version => 1).redact!(create(:redaction)) - # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05 - 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_versions_path(node), :headers => bearer_authorization_header - get api_node_versions_path(old_node.node_id) - assert_match(/lat="0.0000400"/, response.body) - assert_match(/lon="0.0000800"/, response.body) - end + assert_response :success, "Redaction shouldn't have stopped history working." + assert_dom "osm node[id='#{node.id}'][version='1']", 0, + "redacted node #{node.id} version 1 shouldn't be present in the history, even when logged in." - ## - # 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 => 4) - node_v3 = node.old_nodes.find_by(:version => 3) - - do_redact_node(node_v3, - create(:redaction)) - assert_response :unauthorized, "should need to be authenticated to redact." - end + get api_node_versions_path(node, :show_redactions => "true"), :headers => bearer_authorization_header - ## - # test the redaction of an old version of a node, while being - # authorised as a normal user. - def test_redact_node_normal_user - auth_header = bearer_authorization_header - - node = create(:node, :with_history, :version => 4) - node_v3 = node.old_nodes.find_by(:version => 3) - - do_redact_node(node_v3, - create(:redaction), - auth_header) - assert_response :forbidden, "should need to be moderator to redact." + assert_response :success, "Redaction shouldn't have stopped history working." + assert_dom "osm node[id='#{node.id}'][version='1']", 0, + "redacted node #{node.id} version 1 shouldn't be present in the history, even when logged in and passing flag." end - ## - # test that, even as moderator, the current version of a node - # can't be redacted. - def test_redact_node_current_version + def test_index_redacted_moderator + node = create(:node, :with_history, :version => 2) + node.old_nodes.find_by(:version => 1).redact!(create(:redaction)) auth_header = bearer_authorization_header create(:moderator_user) - node = create(:node, :with_history, :version => 4) - node_v4 = node.old_nodes.find_by(:version => 4) - - do_redact_node(node_v4, - create(:redaction), - auth_header) - assert_response :bad_request, "shouldn't be OK to redact current version as moderator." - end + get api_node_versions_path(node), :headers => auth_header - def test_redact_node_by_regular_without_write_redactions_scope - auth_header = bearer_authorization_header(create(:user), :scopes => %w[read_prefs write_api]) - do_redact_redactable_node(auth_header) - assert_response :forbidden, "should need to be moderator to redact." - end + assert_response :success, "Redaction shouldn't have stopped history working." + assert_dom "osm node[id='#{node.id}'][version='1']", 0, + "node #{node.id} version 1 should not be present in the history for moderators when not passing flag." - def test_redact_node_by_regular_with_write_redactions_scope - auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_redactions]) - do_redact_redactable_node(auth_header) - assert_response :forbidden, "should need to be moderator to redact." - end + get api_node_versions_path(node, :show_redactions => "true"), :headers => auth_header - def test_redact_node_by_moderator_without_write_redactions_scope - auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[read_prefs write_api]) - do_redact_redactable_node(auth_header) - assert_response :forbidden, "should need to have write_redactions scope to redact." + assert_response :success, "Redaction shouldn't have stopped history working." + assert_dom "osm node[id='#{node.id}'][version='1']", 1, + "node #{node.id} version 1 should still be present in the history for moderators when passing flag." end - def test_redact_node_by_moderator_with_write_redactions_scope - auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_redactions]) - do_redact_redactable_node(auth_header) - assert_response :success, "should be OK to redact old version as moderator with write_redactions scope." - end + def test_show + node = create(:node, :version => 2) + create(:old_node, :node_id => node.id, :version => 1, :latitude => 60 * OldNode::SCALE, :longitude => 30 * OldNode::SCALE) + create(:old_node, :node_id => node.id, :version => 2, :latitude => 61 * OldNode::SCALE, :longitude => 31 * OldNode::SCALE) - ## - # 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) - auth_header = bearer_authorization_header create(:moderator_user) + get api_node_version_path(node, 1) - do_redact_node(node_v3, create(:redaction), auth_header) - assert_response :success, "should be OK to redact old version as moderator." + assert_response :success + assert_dom "osm:root", 1 do + assert_dom "> node", 1 do + assert_dom "> @id", node.id.to_s + assert_dom "> @version", "1" + assert_dom "> @lat", "60.0000000" + assert_dom "> @lon", "30.0000000" + end + end - # check moderator can still see the redacted data, when passing - # the appropriate flag - get api_node_version_path(node_v3.node_id, node_v3.version), :headers => auth_header - assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed." - get api_node_version_path(node_v3.node_id, node_v3.version, :show_redactions => "true"), :headers => auth_header - assert_response :success, "After redaction, node should not be gone for moderator, when flag passed." + get api_node_version_path(node, 2) - # and when accessed via history - get api_node_versions_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_versions_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." + assert_response :success + assert_dom "osm:root", 1 do + assert_dom "> node", 1 do + assert_dom "> @id", node.id.to_s + assert_dom "> @version", "2" + assert_dom "> @lat", "61.0000000" + assert_dom "> @lon", "31.0000000" + end + end end - # testing that if the moderator drops auth, he can't see the - # redacted stuff any more. - def test_redact_node_is_redacted - node = create(:node, :with_history, :version => 4) - node_v3 = node.old_nodes.find_by(:version => 3) - auth_header = bearer_authorization_header create(:moderator_user) - - do_redact_node(node_v3, create(:redaction), auth_header) - assert_response :success, "should be OK to redact old version as moderator." - - # re-auth as non-moderator - auth_header = bearer_authorization_header - - # check can't see the redacted data - get api_node_version_path(node_v3.node_id, node_v3.version), :headers => auth_header - assert_response :forbidden, "Redacted node shouldn't be visible via the version API." - - # and when accessed via history - get api_node_versions_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." + def test_show_not_found + check_not_found_id_version(70000, 312344) + check_not_found_id_version(-1, -13) + check_not_found_id_version(create(:node).id, 24354) + check_not_found_id_version(24356, create(:node).version) end ## - # test the unredaction of an old version of a node, while not being - # authorised. - def test_unredact_node_unauthorised + # test that redacted nodes aren't visible, regardless of + # authorisation except as moderator... + def test_show_redacted_unauthorised node = create(:node, :with_history, :version => 2) - node_v1 = node.old_nodes.find_by(:version => 1) - node_v1.redact!(create(:redaction)) + node.old_nodes.find_by(:version => 1).redact!(create(:redaction)) - post node_version_redact_path(node_v1.node_id, node_v1.version) - assert_response :unauthorized, "should need to be authenticated to unredact." - end + get api_node_version_path(node, 1) - ## - # test the unredaction of an old version of a node, while being - # authorised as a normal user. - 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)) + assert_response :forbidden, "Redacted node shouldn't be visible via the version API." - auth_header = bearer_authorization_header user + get api_node_version_path(node, 1, :show_redactions => "true") - 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." + assert_response :forbidden, "Redacted node shouldn't be visible via the version API when passing flag." end - ## - # test the unredaction of an old version of a node, while being - # authorised as a moderator. - def test_unredact_node_moderator - moderator_user = create(:moderator_user) + def test_show_redacted_normal_user node = create(:node, :with_history, :version => 2) - node_v1 = node.old_nodes.find_by(:version => 1) - node_v1.redact!(create(:redaction)) + node.old_nodes.find_by(:version => 1).redact!(create(:redaction)) - auth_header = bearer_authorization_header moderator_user + get api_node_version_path(node, 1), :headers => bearer_authorization_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." + assert_response :forbidden, "Redacted node shouldn't be visible via the version API, even when logged in." - # 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." + get api_node_version_path(node, 1, :show_redactions => "true"), :headers => bearer_authorization_header - # 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." + assert_response :forbidden, "Redacted node shouldn't be visible via the version API, even when logged in and passing flag." + end - auth_header = bearer_authorization_header + def test_show_redacted_moderator + node = create(:node, :with_history, :version => 2) + node.old_nodes.find_by(:version => 1).redact!(create(:redaction)) + auth_header = bearer_authorization_header create(:moderator_user) - # 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." + get api_node_version_path(node, 1), :headers => auth_header - # 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." - end + assert_response :forbidden, "Redacted node should be gone for moderator, when flag not passed." - private + get api_node_version_path(node, 1, :show_redactions => "true"), :headers => auth_header - def do_redact_redactable_node(headers = {}) - node = create(:node, :with_history, :version => 4) - node_v3 = node.old_nodes.find_by(:version => 3) - do_redact_node(node_v3, create(:redaction), headers) + assert_response :success, "Redacted node should not be gone for moderator, when flag passed." end - def do_redact_node(node, redaction, headers = {}) - get api_node_version_path(node.node_id, node.version), :headers => headers - assert_response :success, "should be able to get version #{node.version} of node #{node.node_id}." + # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05 + 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) - # now redact it - post node_version_redact_path(node.node_id, node.version), :params => { :redaction => redaction.id }, :headers => headers + get api_node_versions_path(old_node.node_id) + assert_match(/lat="0.0000400"/, response.body) + assert_match(/lon="0.0000800"/, response.body) end + private + def check_not_found_id_version(id, version) get api_node_version_path(id, version) assert_response :not_found