X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ac01ada27496434ff20394278faafb3a0277eb8d..0e50ff563e826578f770c82e8c678ef393a3f862:/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 a982705ed..0cf9aaaa3 100644 --- a/test/controllers/api/old_nodes_controller_test.rb +++ b/test/controllers/api/old_nodes_controller_test.rb @@ -68,7 +68,7 @@ module Api xml_node["lat"] = precision((rand * 180) - 90).to_s xml_node["lon"] = precision((rand * 360) - 180).to_s with_controller(NodesController.new) do - put api_node_path(:id => nodeid), :params => xml_doc.to_s, :headers => auth_header + put api_node_path(nodeid), :params => xml_doc.to_s, :headers => auth_header assert_response :forbidden, "Should have rejected node update" xml_node["version"] = @response.body.to_s end @@ -83,7 +83,7 @@ module Api xml_tag["v"] = random_string xml_node << xml_tag with_controller(NodesController.new) do - put api_node_path(:id => nodeid), :params => xml_doc.to_s, :headers => auth_header + put api_node_path(nodeid), :params => xml_doc.to_s, :headers => auth_header assert_response :forbidden, "should have rejected node #{nodeid} (#{@response.body}) with forbidden" xml_node["version"] = @response.body.to_s @@ -116,7 +116,7 @@ module Api xml_node["lat"] = precision((rand * 180) - 90).to_s xml_node["lon"] = precision((rand * 360) - 180).to_s with_controller(NodesController.new) do - put api_node_path(:id => nodeid), :params => xml_doc.to_s, :headers => auth_header + put api_node_path(nodeid), :params => xml_doc.to_s, :headers => auth_header assert_response :success xml_node["version"] = @response.body.to_s end @@ -131,7 +131,7 @@ module Api xml_tag["v"] = random_string xml_node << xml_tag with_controller(NodesController.new) do - put api_node_path(:id => nodeid), :params => xml_doc.to_s, :headers => auth_header + put api_node_path(nodeid), :params => xml_doc.to_s, :headers => auth_header assert_response :success, "couldn't update node #{nodeid} (#{@response.body})" xml_node["version"] = @response.body.to_s @@ -142,7 +142,7 @@ module Api # check all the versions versions.each_key do |key| - get api_old_node_path(:id => nodeid, :version => key.to_i) + get api_old_node_path(nodeid, key.to_i) assert_response :success, "couldn't get version #{key.to_i} of node #{nodeid}" @@ -283,12 +283,12 @@ module Api node_v1 = node.old_nodes.find_by(:version => 1) node_v1.redact!(create(:redaction)) - get api_old_node_path(:id => node_v1.node_id, :version => node_v1.version) + get api_old_node_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 = basic_authorization_header create(:user).email, "test" - get api_old_node_path(:id => node_v1.node_id, :version => node_v1.version), :headers => auth_header + get api_old_node_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 @@ -325,9 +325,9 @@ module Api # check moderator can still see the redacted data, when passing # the appropriate flag - get api_old_node_path(:id => node_v3.node_id, :version => node_v3.version), :headers => auth_header + get api_old_node_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_old_node_path(:id => node_v3.node_id, :version => node_v3.version), :params => { :show_redactions => "true" }, :headers => auth_header + get api_old_node_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." # and when accessed via history @@ -355,7 +355,7 @@ module Api auth_header = basic_authorization_header create(:user).email, "test" # check can't see the redacted data - get api_old_node_path(:id => node_v3.node_id, :version => node_v3.version), :headers => auth_header + get api_old_node_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 @@ -408,7 +408,7 @@ module Api # check moderator can now see the redacted data, when not # passing the aspecial flag - get api_old_node_path(:id => node_v1.node_id, :version => node_v1.version), :headers => auth_header + get api_old_node_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 @@ -420,7 +420,7 @@ module Api auth_header = basic_authorization_header create(:user).email, "test" # check normal user can now see the redacted data - get api_old_node_path(:id => node_v1.node_id, :version => node_v1.version), :headers => auth_header + get api_old_node_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 @@ -446,7 +446,7 @@ module Api end def do_redact_node(node, redaction, headers = {}) - get api_old_node_path(:id => node.node_id, :version => node.version), :headers => headers + get api_old_node_path(node.node_id, node.version), :headers => headers assert_response :success, "should be able to get version #{node.version} of node #{node.node_id}." # now redact it @@ -456,14 +456,14 @@ module Api def check_current_version(node_id) # get the current version of the node current_node = with_controller(NodesController.new) do - get api_node_path(:id => node_id) + get api_node_path(node_id) assert_response :success, "cant get current node #{node_id}" Node.from_xml(@response.body) end assert_not_nil current_node, "getting node #{node_id} returned nil" # get the "old" version of the node from the old_node interface - get api_old_node_path(:id => node_id, :version => current_node.version) + get api_old_node_path(node_id, current_node.version) assert_response :success, "cant get old node #{node_id}, v#{current_node.version}" old_node = Node.from_xml(@response.body) @@ -472,7 +472,7 @@ module Api end def check_not_found_id_version(id, version) - get api_old_node_path(:id => id, :version => version) + get api_old_node_path(id, version) assert_response :not_found rescue ActionController::UrlGenerationError => e assert_match(/No route matches/, e.to_s)