cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert remaining old_node_controller tests to use factories.

Browse source
This commit is contained in:
Andy Allan 2017-05-10 11:47:10 +01:00
parent 1df5bd247f
commit bdf817103a
1 changed files with 98 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

164
test/controllers/old_node_controller_test.rb
View file

@ -33,13 +33,21 @@ class OldNodeControllerTest < ActionController::TestCase
## ##
# 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 def test_version
private_user = create(:user, :data_public => false)
private_node = create(:node, :with_history, :version => 4, :changeset => create(:changeset, :user => private_user))
user = create(:user)
node = create(:node, :with_history, :version => 4, :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 ## First try this with a non-public user
basic_authorization(users(:normal_user).email, "test") basic_authorization(private_user.email, "test")
# setup a simple XML node # setup a simple XML node
xml_doc = current_nodes(:visible_node).to_xml xml_doc = private_node.to_xml
xml_node = xml_doc.find("//osm/node").first xml_node = xml_doc.find("//osm/node").first
nodeid = current_nodes(:visible_node).id nodeid = private_node.id
# keep a hash of the versions => string, as we'll need something # keep a hash of the versions => string, as we'll need something
# to test against later # to test against later
@ -83,16 +91,13 @@ class OldNodeControllerTest < ActionController::TestCase
# probably should check that they didn't get written to the database # probably should check that they didn't get written to the database
## Now do it with the public user ## Now do it with the public user
basic_authorization(users(:public_user).email, "test") basic_authorization(user.email, "test")
# setup a simple XML node # setup a simple XML node
create_list(:node_tag, 2, :node => current_nodes(:node_with_versions))
xml_doc = current_nodes(:node_with_versions).to_xml
xml_node = xml_doc.find("//osm/node").first
nodeid = current_nodes(:node_with_versions).id
# Ensure that the current tags are propagated to the history too xml_doc = node.to_xml
propagate_tags(current_nodes(:node_with_versions), nodes(:node_with_versions_v4)) xml_node = xml_doc.find("//osm/node").first
nodeid = node.id
# keep a hash of the versions => string, as we'll need something # keep a hash of the versions => string, as we'll need something
# to test against later # to test against later
@ -150,8 +155,8 @@ class OldNodeControllerTest < ActionController::TestCase
def test_not_found_version def test_not_found_version
check_not_found_id_version(70000, 312344) check_not_found_id_version(70000, 312344)
check_not_found_id_version(-1, -13) check_not_found_id_version(-1, -13)
check_not_found_id_version(nodes(:visible_node).id, 24354) check_not_found_id_version(create(:node).id, 24354)
check_not_found_id_version(24356, nodes(:visible_node).version) check_not_found_id_version(24356, create(:node).version)
end end
def check_not_found_id_version(id, version) def check_not_found_id_version(id, version)
@ -165,29 +170,36 @@ class OldNodeControllerTest < ActionController::TestCase
# Test that getting the current version is identical to picking # Test that getting the current version is identical to picking
# that version with the version URI call. # that version with the version URI call.
def test_current_version def test_current_version
create(:node_tag, :node => current_nodes(:visible_node)) node = create(:node, :with_history)
create(:node_tag, :node => current_nodes(:used_node_1)) used_node = create(:node, :with_history)
create(:node_tag, :node => current_nodes(:used_node_2)) create(:way_node, :node => used_node)
create(:node_tag, :node => current_nodes(:node_used_by_relationship)) node_used_by_relationship = create(:node, :with_history)
create(:node_tag, :node => current_nodes(:node_with_versions)) create(:relation_member, :member => node_used_by_relationship)
propagate_tags(current_nodes(:visible_node), nodes(:visible_node)) node_with_versions = create(:node, :with_history, :version => 4)
propagate_tags(current_nodes(:used_node_1), nodes(:used_node_1))
propagate_tags(current_nodes(:used_node_2), nodes(:used_node_2))
propagate_tags(current_nodes(:node_used_by_relationship), nodes(:node_used_by_relationship))
propagate_tags(current_nodes(:node_with_versions), nodes(:node_with_versions_v4))
check_current_version(current_nodes(:visible_node)) create(:node_tag, :node => node)
check_current_version(current_nodes(:used_node_1)) create(:node_tag, :node => used_node)
check_current_version(current_nodes(:used_node_2)) create(:node_tag, :node => node_used_by_relationship)
check_current_version(current_nodes(:node_used_by_relationship)) create(:node_tag, :node => node_with_versions)
check_current_version(current_nodes(: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)
end end
## ##
# test the redaction of an old version of a node, while not being # test the redaction of an old version of a node, while not being
# authorised. # authorised.
def test_redact_node_unauthorised def test_redact_node_unauthorised
do_redact_node(nodes(:node_with_versions_v3), node = create(:node, :with_history, :version => 4)
node_v3 = node.old_nodes.find_by(:version => 3)
do_redact_node(node_v3,
create(:redaction)) create(:redaction))
assert_response :unauthorized, "should need to be authenticated to redact." assert_response :unauthorized, "should need to be authenticated to redact."
end end
@ -198,7 +210,10 @@ class OldNodeControllerTest < ActionController::TestCase
def test_redact_node_normal_user def test_redact_node_normal_user
basic_authorization(create(:user).email, "test") basic_authorization(create(:user).email, "test")
do_redact_node(nodes(:node_with_versions_v3), node = create(:node, :with_history, :version => 4)
node_v3 = node.old_nodes.find_by(:version => 3)
do_redact_node(node_v3,
create(:redaction)) create(:redaction))
assert_response :forbidden, "should need to be moderator to redact." assert_response :forbidden, "should need to be moderator to redact."
end end
@ -209,7 +224,10 @@ class OldNodeControllerTest < ActionController::TestCase
def test_redact_node_current_version def test_redact_node_current_version
basic_authorization(create(:moderator_user).email, "test") basic_authorization(create(:moderator_user).email, "test")
do_redact_node(nodes(:node_with_versions_v4), node = create(:node, :with_history, :version => 4)
node_v4 = node.old_nodes.find_by(:version => 4)
do_redact_node(node_v4,
create(:redaction)) create(:redaction))
assert_response :bad_request, "shouldn't be OK to redact current version as moderator." assert_response :bad_request, "shouldn't be OK to redact current version as moderator."
end end
@ -218,88 +236,96 @@ class OldNodeControllerTest < ActionController::TestCase
# test that redacted nodes aren't visible, regardless of # test that redacted nodes aren't visible, regardless of
# authorisation except as moderator... # authorisation except as moderator...
def test_version_redacted def test_version_redacted
node = nodes(:redacted_node_redacted_version) node = create(:node, :with_history, :version => 2)
node_v1 = node.old_nodes.find_by(:version => 1)
node_v1.redact!(create(:redaction))
get :version, :id => node.node_id, :version => node.version get :version, :id => node_v1.node_id, :version => node_v1.version
assert_response :forbidden, "Redacted node shouldn't be visible via the version API." assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
# not even to a logged-in user # not even to a logged-in user
basic_authorization(users(:public_user).email, "test") basic_authorization(create(:user).email, "test")
get :version, :id => node.node_id, :version => node.version get :version, :id => node_v1.node_id, :version => node_v1.version
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, even when logged in."
end end
## ##
# test that redacted nodes aren't visible in the history # test that redacted nodes aren't visible in the history
def test_history_redacted def test_history_redacted
node = nodes(:redacted_node_redacted_version) node = create(:node, :with_history, :version => 2)
node_v1 = node.old_nodes.find_by(:version => 1)
node_v1.redact!(create(:redaction))
get :history, :id => node.node_id get :history, :id => node_v1.node_id
assert_response :success, "Redaction shouldn't have stopped history working." assert_response :success, "Redaction shouldn't have stopped history working."
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." 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 # not even to a logged-in user
basic_authorization(users(:public_user).email, "test") basic_authorization(create(:user).email, "test")
get :history, :id => node.node_id get :history, :id => node_v1.node_id
assert_response :success, "Redaction shouldn't have stopped history working." assert_response :success, "Redaction shouldn't have stopped history working."
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, even when logged in." 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 end
## ##
# test the redaction of an old version of a node, while being # test the redaction of an old version of a node, while being
# authorised as a moderator. # authorised as a moderator.
def test_redact_node_moderator def test_redact_node_moderator
node = nodes(:node_with_versions_v3) node = create(:node, :with_history, :version => 4)
node_v3 = node.old_nodes.find_by(:version => 3)
basic_authorization(create(:moderator_user).email, "test") basic_authorization(create(:moderator_user).email, "test")
do_redact_node(node, create(:redaction)) do_redact_node(node_v3, create(:redaction))
assert_response :success, "should be OK to redact old version as moderator." assert_response :success, "should be OK to redact old version as moderator."
# check moderator can still see the redacted data, when passing # check moderator can still see the redacted data, when passing
# the appropriate flag # the appropriate flag
get :version, :id => node.node_id, :version => node.version get :version, :id => node_v3.node_id, :version => node_v3.version
assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed." 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_v3.node_id, :version => node_v3.version, :show_redactions => "true"
assert_response :success, "After redaction, node should not be gone for moderator, when flag passed." assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
# and when accessed via history # and when accessed via history
get :history, :id => node.node_id get :history, :id => node_v3.node_id
assert_response :success, "Redaction shouldn't have stopped history working." 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." 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 :history, :id => node.node_id, :show_redactions => "true" get :history, :id => node_v3.node_id, :show_redactions => "true"
assert_response :success, "Redaction shouldn't have stopped history working." 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." 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."
end end
# testing that if the moderator drops auth, he can't see the # testing that if the moderator drops auth, he can't see the
# redacted stuff any more. # redacted stuff any more.
def test_redact_node_is_redacted def test_redact_node_is_redacted
node = nodes(:node_with_versions_v3) node = create(:node, :with_history, :version => 4)
node_v3 = node.old_nodes.find_by(:version => 3)
basic_authorization(create(:moderator_user).email, "test") basic_authorization(create(:moderator_user).email, "test")
do_redact_node(node, create(:redaction)) do_redact_node(node_v3, create(:redaction))
assert_response :success, "should be OK to redact old version as moderator." assert_response :success, "should be OK to redact old version as moderator."
# re-auth as non-moderator # re-auth as non-moderator
basic_authorization(create(:user).email, "test") basic_authorization(create(:user).email, "test")
# check can't see the redacted data # check can't see the redacted data
get :version, :id => node.node_id, :version => node.version get :version, :id => node_v3.node_id, :version => node_v3.version
assert_response :forbidden, "Redacted node shouldn't be visible via the version API." assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
# and when accessed via history # and when accessed via history
get :history, :id => node.node_id get :history, :id => node_v3.node_id
assert_response :success, "Redaction shouldn't have stopped history working." assert_response :success, "Redaction shouldn't have stopped history working."
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." 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."
end end
## ##
# test the unredaction of an old version of a node, while not being # test the unredaction of an old version of a node, while not being
# authorised. # authorised.
def test_unredact_node_unauthorised def test_unredact_node_unauthorised
node = nodes(:redacted_node_redacted_version) node = create(:node, :with_history, :version => 2)
node_v1 = node.old_nodes.find_by(:version => 1)
node_v1.redact!(create(:redaction))
post :redact, :id => node.node_id, :version => node.version post :redact, :id => node_v1.node_id, :version => node_v1.version
assert_response :unauthorized, "should need to be authenticated to unredact." assert_response :unauthorized, "should need to be authenticated to unredact."
end end
@ -308,10 +334,13 @@ class OldNodeControllerTest < ActionController::TestCase
# authorised as a normal user. # authorised as a normal user.
def test_unredact_node_normal_user def test_unredact_node_normal_user
user = create(:user) user = create(:user)
node = nodes(:redacted_node_redacted_version) node = create(:node, :with_history, :version => 2)
node_v1 = node.old_nodes.find_by(:version => 1)
node_v1.redact!(create(:redaction))
basic_authorization(user.email, "test") basic_authorization(user.email, "test")
post :redact, :id => node.node_id, :version => node.version post :redact, :id => node_v1.node_id, :version => node_v1.version
assert_response :forbidden, "should need to be moderator to unredact." assert_response :forbidden, "should need to be moderator to unredact."
end end
@ -320,32 +349,35 @@ class OldNodeControllerTest < ActionController::TestCase
# authorised as a moderator. # authorised as a moderator.
def test_unredact_node_moderator def test_unredact_node_moderator
moderator_user = create(:moderator_user) moderator_user = create(:moderator_user)
node = nodes(:redacted_node_redacted_version) node = create(:node, :with_history, :version => 2)
node_v1 = node.old_nodes.find_by(:version => 1)
node_v1.redact!(create(:redaction))
basic_authorization(moderator_user.email, "test") basic_authorization(moderator_user.email, "test")
post :redact, :id => node.node_id, :version => node.version post :redact, :id => node_v1.node_id, :version => node_v1.version
assert_response :success, "should be OK to redact old version as moderator." assert_response :success, "should be OK to unredact old version as moderator."
# check moderator can now see the redacted data, when not # check moderator can now see the redacted data, when not
# passing the aspecial flag # passing the aspecial flag
get :version, :id => node.node_id, :version => node.version get :version, :id => node_v1.node_id, :version => node_v1.version
assert_response :success, "After unredaction, node should not be gone for moderator." assert_response :success, "After unredaction, node should not be gone for moderator."
# and when accessed via history # and when accessed via history
get :history, :id => node.node_id get :history, :id => node_v1.node_id
assert_response :success, "Unredaction shouldn't have stopped history working." 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." 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."
basic_authorization(create(:user).email, "test") basic_authorization(create(:user).email, "test")
# check normal user can now see the redacted data # check normal user can now see the redacted data
get :version, :id => node.node_id, :version => node.version get :version, :id => node_v1.node_id, :version => node_v1.version
assert_response :success, "After unredaction, node should be visible to normal users." assert_response :success, "After unredaction, node should be visible to normal users."
# and when accessed via history # and when accessed via history
get :history, :id => node.node_id get :history, :id => node_v1.node_id
assert_response :success, "Unredaction shouldn't have stopped history working." 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 normal users without passing flag." 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 end
private private