-require 'test_helper'
-require 'old_node_controller'
+require "test_helper"
+require "old_node_controller"
class OldNodeControllerTest < ActionController::TestCase
api_fixtures
# matching versions of the object.
#
##
- # FIXME Move this test to being an integration test since it spans multiple controllers
+ # FIXME: Move this test to being an integration test since it spans multiple controllers
def test_version
## First try this with a non-public user
basic_authorization(users(:normal_user).email, "test")
- changeset_id = changesets(:normal_user_first_change).id
# setup a simple XML node
xml_doc = current_nodes(:visible_node).to_xml
versions = {}
# save a version for later checking
- versions[xml_node['version']] = xml_doc.to_s
+ versions[xml_node["version"]] = xml_doc.to_s
# randomly move the node about
20.times do
# move the node somewhere else
- xml_node['lat'] = precision(rand * 180 - 90).to_s
- xml_node['lon'] = precision(rand * 360 - 180).to_s
+ xml_node["lat"] = precision(rand * 180 - 90).to_s
+ xml_node["lon"] = precision(rand * 360 - 180).to_s
with_controller(NodeController.new) do
content xml_doc
put :update, :id => nodeid
assert_response :forbidden, "Should have rejected node update"
- xml_node['version'] = @response.body.to_s
+ xml_node["version"] = @response.body.to_s
end
# save a version for later checking
- versions[xml_node['version']] = xml_doc.to_s
+ versions[xml_node["version"]] = xml_doc.to_s
end
# add a bunch of random tags
30.times do
xml_tag = XML::Node.new("tag")
- xml_tag['k'] = random_string
- xml_tag['v'] = random_string
+ xml_tag["k"] = random_string
+ xml_tag["v"] = random_string
xml_node << xml_tag
with_controller(NodeController.new) do
content xml_doc
put :update, :id => nodeid
assert_response :forbidden,
"should have rejected node #{nodeid} (#{@response.body}) with forbidden"
- xml_node['version'] = @response.body.to_s
+ xml_node["version"] = @response.body.to_s
end
# save a version for later checking
- versions[xml_node['version']] = xml_doc.to_s
+ 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
basic_authorization(users(:public_user).email, "test")
- changeset_id = changesets(:public_user_first_change).id
# setup a simple XML node
xml_doc = current_nodes(:node_with_versions).to_xml
versions = {}
# save a version for later checking
- versions[xml_node['version']] = xml_doc.to_s
+ versions[xml_node["version"]] = xml_doc.to_s
# randomly move the node about
20.times do
# move the node somewhere else
- xml_node['lat'] = precision(rand * 180 - 90).to_s
- xml_node['lon'] = precision(rand * 360 - 180).to_s
+ xml_node["lat"] = precision(rand * 180 - 90).to_s
+ xml_node["lon"] = precision(rand * 360 - 180).to_s
with_controller(NodeController.new) do
content xml_doc
put :update, :id => nodeid
assert_response :success
- xml_node['version'] = @response.body.to_s
+ xml_node["version"] = @response.body.to_s
end
# save a version for later checking
- versions[xml_node['version']] = xml_doc.to_s
+ versions[xml_node["version"]] = xml_doc.to_s
end
# add a bunch of random tags
30.times do
xml_tag = XML::Node.new("tag")
- xml_tag['k'] = random_string
- xml_tag['v'] = random_string
+ xml_tag["k"] = random_string
+ xml_tag["v"] = random_string
xml_node << xml_tag
with_controller(NodeController.new) do
content xml_doc
put :update, :id => nodeid
assert_response :success,
"couldn't update node #{nodeid} (#{@response.body})"
- xml_node['version'] = @response.body.to_s
+ xml_node["version"] = @response.body.to_s
end
# save a version for later checking
- versions[xml_node['version']] = xml_doc.to_s
+ versions[xml_node["version"]] = xml_doc.to_s
end
# check all the versions
check_not_found_id_version(70000, 312344)
check_not_found_id_version(-1, -13)
check_not_found_id_version(nodes(:visible_node).id, 24354)
- check_not_found_id_version(24356, nodes(:visible_node).version)
+ check_not_found_id_version(24356, nodes(:visible_node).version)
end
def check_not_found_id_version(id, version)
# the appropriate flag
get :version, :id => node.node_id, :version => node.version
assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed."
- get :version, :id => node.node_id, :version => node.version, :show_redactions => 'true'
+ get :version, :id => node.node_id, :version => node.version, :show_redactions => "true"
assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
# and when accessed via history
get :history, :id => node.node_id
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm node[id='#{node.node_id}'][version='#{node.version}']", 0, "node #{node.node_id} version #{node.version} should not be present in the history for moderators when not passing flag."
- get :history, :id => node.node_id, :show_redactions => 'true'
+ get :history, :id => node.node_id, :show_redactions => "true"
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm node[id='#{node.node_id}'][version='#{node.version}']", 1, "node #{node.node_id} version #{node.version} should still be present in the history for moderators when passing flag."
end
assert_select "osm node[id='#{node.node_id}'][version='#{node.version}']", 0, "redacted node #{node.node_id} version #{node.version} shouldn't be present in the history."
end
+ ##
+ # test the unredaction of an old version of a node, while not being
+ # authorised.
+ def test_unredact_node_unauthorised
+ node = nodes(:redacted_node_redacted_version)
+
+ post :redact, :id => node.node_id, :version => node.version
+ assert_response :unauthorized, "should need to be authenticated to unredact."
+ end
+
+ ##
+ # test the unredaction of an old version of a node, while being
+ # authorised as a normal user.
+ def test_unredact_node_normal_user
+ node = nodes(:redacted_node_redacted_version)
+ basic_authorization(users(:public_user).email, "test")
+
+ post :redact, :id => node.node_id, :version => node.version
+ assert_response :forbidden, "should need to be moderator to unredact."
+ end
+
+ ##
+ # test the unredaction of an old version of a node, while being
+ # authorised as a moderator.
+ def test_unredact_node_moderator
+ node = nodes(:redacted_node_redacted_version)
+ basic_authorization(users(:moderator_user).email, "test")
+
+ post :redact, :id => node.node_id, :version => node.version
+ assert_response :success, "should be OK to redact old version as moderator."
+
+ # check moderator can now see the redacted data, when not
+ # passing the aspecial flag
+ get :version, :id => node.node_id, :version => node.version
+ assert_response :success, "After unredaction, node should not be gone for moderator."
+
+ # and when accessed via history
+ get :history, :id => node.node_id
+ assert_response :success, "Unredaction shouldn't have stopped history working."
+ assert_select "osm node[id='#{node.node_id}'][version='#{node.version}']", 1, "node #{node.node_id} version #{node.version} should now be present in the history for moderators without passing flag."
+
+ basic_authorization(users(:normal_user).email, "test")
+
+ # check normal user can now see the redacted data
+ get :version, :id => node.node_id, :version => node.version
+ assert_response :success, "After unredaction, node should not be gone for moderator."
+
+ # and when accessed via history
+ get :history, :id => node.node_id
+ assert_response :success, "Unredaction shouldn't have stopped history working."
+ assert_select "osm node[id='#{node.node_id}'][version='#{node.version}']", 1, "node #{node.node_id} version #{node.version} should now be present in the history for moderators without passing flag."
+ end
+
+ private
+
def do_redact_node(node, redaction)
get :version, :id => node.node_id, :version => node.version
assert_response :success, "should be able to get version #{node.version} of node #{node.node_id}."
# 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
+ letters = [["!", '"', "$", "&", ";", "@"],
+ ("a".."z").to_a,
+ ("A".."Z").to_a,
+ ("0".."9").to_a].flatten
(1..16).map { |_i| letters[rand(letters.length)] }.join
end
projects / rails.git / blobdiff