##
# 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."
+ assert_dom "osm node[id='#{node.id}'][version='1']", 0,
+ "redacted node #{node.id} version 1 shouldn't be present in the history."
end
- ##
- # test the version call by submitting several revisions of a new node
- # to the API and ensuring that later calls to version return the
- # matching versions of the object.
- #
- ##
- # FIXME: Move this test to being an integration test since it spans multiple controllers
- def test_show
- private_user = create(:user, :data_public => false)
- private_node = create(:node, :with_history, :version => 4, :lat => 0, :lon => 0, :changeset => create(:changeset, :user => private_user))
- user = create(:user)
- node = create(:node, :with_history, :version => 4, :lat => 0, :lon => 0, :changeset => create(:changeset, :user => user))
- create_list(:node_tag, 2, :node => node)
- # Ensure that the current tags are propagated to the history too
- propagate_tags(node, node.old_nodes.last)
-
- ## First try this with a non-public user
- auth_header = bearer_authorization_header private_user
-
- # setup a simple XML node
- xml_doc = xml_for_node(private_node)
- xml_node = xml_doc.find("//osm/node").first
- nodeid = private_node.id
-
- # keep a hash of the versions => string, as we'll need something
- # to test against later
- versions = {}
-
- # save a version for later checking
- versions[xml_node["version"]] = xml_doc.to_s
-
- # randomly move the node about
- 3.times do
- # move the node somewhere else
- xml_node["lat"] = precision(rand - 0.5).to_s
- xml_node["lon"] = precision(rand - 0.5).to_s
- with_controller(NodesController.new) do
- 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
- # save a version for later checking
- versions[xml_node["version"]] = xml_doc.to_s
- end
-
- # add a bunch of random tags
- 3.times do
- xml_tag = XML::Node.new("tag")
- xml_tag["k"] = random_string
- xml_tag["v"] = random_string
- xml_node << xml_tag
- with_controller(NodesController.new) do
- 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
- end
- # save a version for later checking
- versions[xml_node["version"]] = xml_doc.to_s
- end
-
- # probably should check that they didn't get written to the database
-
- ## Now do it with the public user
- auth_header = bearer_authorization_header user
-
- # setup a simple XML node
+ def test_index_redacted_normal_user
+ node = create(:node, :with_history, :version => 2)
+ node.old_nodes.find_by(:version => 1).redact!(create(:redaction))
- xml_doc = xml_for_node(node)
- xml_node = xml_doc.find("//osm/node").first
- nodeid = node.id
+ get api_node_versions_path(node), :headers => bearer_authorization_header
- # keep a hash of the versions => string, as we'll need something
- # to test against later
- versions = {}
+ 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."
+ end
- # save a version for later checking
- versions[xml_node["version"]] = xml_doc.to_s
+ 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)
- # randomly move the node about
- 3.times do
- # move the node somewhere else
- xml_node["lat"] = precision(rand - 0.5).to_s
- xml_node["lon"] = precision(rand - 0.5).to_s
- with_controller(NodesController.new) do
- put api_node_path(nodeid), :params => xml_doc.to_s, :headers => auth_header
- assert_response :success
- xml_node["version"] = @response.body.to_s
- end
- # save a version for later checking
- versions[xml_node["version"]] = xml_doc.to_s
- end
+ get api_node_version_path(node, 1)
- # add a bunch of random tags
- 3.times do
- xml_tag = XML::Node.new("tag")
- xml_tag["k"] = random_string
- xml_tag["v"] = random_string
- xml_node << xml_tag
- with_controller(NodesController.new) do
- 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
+ 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
- # save a version for later checking
- versions[xml_node["version"]] = xml_doc.to_s
end
- # check all the versions
- versions.each_key do |key|
- get api_node_version_path(nodeid, key.to_i)
-
- assert_response :success,
- "couldn't get version #{key.to_i} of node #{nodeid}"
+ get api_node_version_path(node, 2)
- check_node = Node.from_xml(versions[key])
- api_node = Node.from_xml(@response.body.to_s)
-
- assert_nodes_are_equal check_node, api_node
+ 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
##
# test that redacted nodes aren't visible, regardless of
# authorisation except as moderator...
- def test_show_redacted
+ 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))
- 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."
+ get api_node_version_path(node, 1)
- # 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."
+ assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
end
- ##
- # Test that getting the current version is identical to picking
- # that version with the version URI call.
- def test_current_version
- node = create(:node, :with_history)
- used_node = create(:node, :with_history)
- create(:way_node, :node => used_node)
- node_used_by_relationship = create(:node, :with_history)
- create(:relation_member, :member => node_used_by_relationship)
- node_with_versions = create(:node, :with_history, :version => 4)
-
- create(:node_tag, :node => node)
- create(:node_tag, :node => used_node)
- create(:node_tag, :node => node_used_by_relationship)
- create(:node_tag, :node => node_with_versions)
- propagate_tags(node, node.old_nodes.last)
- propagate_tags(used_node, used_node.old_nodes.last)
- propagate_tags(node_used_by_relationship, node_used_by_relationship.old_nodes.last)
- propagate_tags(node_with_versions, node_with_versions.old_nodes.last)
-
- check_current_version(node)
- check_current_version(used_node)
- check_current_version(node_used_by_relationship)
- check_current_version(node_with_versions)
+ def test_show_redacted_normal_user
+ node = create(:node, :with_history, :version => 2)
+ node.old_nodes.find_by(:version => 1).redact!(create(:redaction))
+
+ get api_node_version_path(node, 1), :headers => bearer_authorization_header
+
+ assert_response :forbidden, "Redacted node shouldn't be visible via the version API, even when logged in."
end
# Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05
post node_version_redact_path(node.node_id, node.version), :params => { :redaction => redaction.id }, :headers => headers
end
- def check_current_version(node_id)
- # get the current version of the node
- current_node = with_controller(NodesController.new) do
- 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_node_version_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)
-
- # check the nodes are the same
- assert_nodes_are_equal current_node, old_node
- end
-
def check_not_found_id_version(id, version)
get api_node_version_path(id, version)
assert_response :not_found
rescue ActionController::UrlGenerationError => e
assert_match(/No route matches/, e.to_s)
end
-
- ##
- # returns a 16 character long string with some nasty characters in it.
- # this ought to stress-test the tag handling as well as the versioning.
- def random_string
- letters = [["!", '"', "$", "&", ";", "@"],
- ("a".."z").to_a,
- ("A".."Z").to_a,
- ("0".."9").to_a].flatten
- (1..16).map { letters[rand(letters.length)] }.join
- end
-
- ##
- # truncate a floating point number to the scale that it is stored in
- # the database. otherwise rounding errors can produce failing unit
- # tests when they shouldn't.
- def precision(f)
- (f * GeoRecord::SCALE).round.to_f / GeoRecord::SCALE
- end
-
- def propagate_tags(node, old_node)
- node.tags.each do |k, v|
- create(:old_node_tag, :old_node => old_node, :k => k, :v => v)
- end
- end
end
end
projects / rails.git / blobdiff