##
# test that redacted relations aren't visible in the history
- def test_index_redacted
+ def test_index_redacted_unauthorised
relation = create(:relation, :with_history, :version => 2)
- relation_v1 = relation.old_relations.find_by(:version => 1)
- relation_v1.redact!(create(:redaction))
+ relation.old_relations.find_by(:version => 1).redact!(create(:redaction))
get api_relation_versions_path(relation)
+
assert_response :success, "Redaction shouldn't have stopped history working."
- assert_select "osm relation[id='#{relation_v1.relation_id}'][version='#{relation_v1.version}']", 0,
- "redacted relation #{relation_v1.relation_id} version #{relation_v1.version} shouldn't be present in the history."
+ assert_dom "osm relation[id='#{relation.id}'][version='1']", 0,
+ "redacted relation #{relation.id} version 1 shouldn't be present in the history."
+
+ get api_relation_versions_path(relation, :show_redactions => "true")
+
+ assert_response :success, "Redaction shouldn't have stopped history working."
+ assert_dom "osm relation[id='#{relation.id}'][version='1']", 0,
+ "redacted relation #{relation.id} version 1 shouldn't be present in the history when passing flag."
+ end
+
+ def test_index_redacted_normal_user
+ relation = create(:relation, :with_history, :version => 2)
+ relation.old_relations.find_by(:version => 1).redact!(create(:redaction))
+
+ get api_relation_versions_path(relation), :headers => bearer_authorization_header
+
+ assert_response :success, "Redaction shouldn't have stopped history working."
+ assert_dom "osm relation[id='#{relation.id}'][version='1']", 0,
+ "redacted relation #{relation.id} version 1 shouldn't be present in the history, even when logged in."
+
+ get api_relation_versions_path(relation, :show_redactions => "true"), :headers => bearer_authorization_header
+
+ assert_response :success, "Redaction shouldn't have stopped history working."
+ assert_dom "osm relation[id='#{relation.id}'][version='1']", 0,
+ "redacted relation #{relation.id} version 1 shouldn't be present in the history, even when logged in and passing flag."
+ end
+
+ def test_index_redacted_moderator
+ relation = create(:relation, :with_history, :version => 2)
+ relation.old_relations.find_by(:version => 1).redact!(create(:redaction))
+ auth_header = bearer_authorization_header create(:moderator_user)
- # not even to a logged-in user
- auth_header = bearer_authorization_header
get api_relation_versions_path(relation), :headers => auth_header
+
assert_response :success, "Redaction shouldn't have stopped history working."
- assert_select "osm relation[id='#{relation_v1.relation_id}'][version='#{relation_v1.version}']", 0,
- "redacted relation #{relation_v1.relation_id} version #{relation_v1.version} shouldn't be present in the history, even when logged in."
+ assert_dom "osm relation[id='#{relation.id}'][version='1']", 0,
+ "relation #{relation.id} version 1 should not be present in the history for moderators when not passing flag."
+
+ get api_relation_versions_path(relation, :show_redactions => "true"), :headers => auth_header
+
+ assert_response :success, "Redaction shouldn't have stopped history working."
+ assert_dom "osm relation[id='#{relation.id}'][version='1']", 1,
+ "relation #{relation.id} version 1 should still be present in the history for moderators when passing flag."
end
def test_show
##
# test that redacted relations aren't visible, regardless of
# authorisation except as moderator...
- def test_show_redacted
+ def test_show_redacted_unauthorised
relation = create(:relation, :with_history, :version => 2)
- relation_v1 = relation.old_relations.find_by(:version => 1)
- relation_v1.redact!(create(:redaction))
+ relation.old_relations.find_by(:version => 1).redact!(create(:redaction))
+
+ get api_relation_version_path(relation, 1)
- get api_relation_version_path(relation_v1.relation_id, relation_v1.version)
assert_response :forbidden, "Redacted relation shouldn't be visible via the version API."
- # not even to a logged-in user
- auth_header = bearer_authorization_header
- get api_relation_version_path(relation_v1.relation_id, relation_v1.version), :headers => auth_header
+ get api_relation_version_path(relation, 1, :show_redactions => "true")
+
+ assert_response :forbidden, "Redacted relation shouldn't be visible via the version API when passing flag."
+ end
+
+ def test_show_redacted_normal_user
+ relation = create(:relation, :with_history, :version => 2)
+ relation.old_relations.find_by(:version => 1).redact!(create(:redaction))
+
+ get api_relation_version_path(relation, 1), :headers => bearer_authorization_header
+
assert_response :forbidden, "Redacted relation shouldn't be visible via the version API, even when logged in."
+
+ get api_relation_version_path(relation, 1, :show_redactions => "true"), :headers => bearer_authorization_header
+
+ assert_response :forbidden, "Redacted relation shouldn't be visible via the version API, even when logged in and passing flag."
+ end
+
+ def test_show_redacted_moderator
+ relation = create(:relation, :with_history, :version => 2)
+ relation.old_relations.find_by(:version => 1).redact!(create(:redaction))
+ auth_header = bearer_authorization_header create(:moderator_user)
+
+ get api_relation_version_path(relation, 1), :headers => auth_header
+
+ assert_response :forbidden, "Redacted relation should be gone for moderator, when flag not passed."
+
+ get api_relation_version_path(relation, 1, :show_redactions => "true"), :headers => auth_header
+
+ assert_response :success, "Redacted relation should not be gone for moderator, when flag passed."
end
##
# test the redaction of an old version of a relation, while not being
# authorised.
def test_redact_relation_unauthorised
- relation = create(:relation, :with_history, :version => 4)
- relation_v3 = relation.old_relations.find_by(:version => 3)
-
- do_redact_relation(relation_v3, create(:redaction))
+ do_redact_redactable_relation
assert_response :unauthorized, "should need to be authenticated to redact."
end
# test the redaction of an old version of a relation, while being
# authorised as a normal user.
def test_redact_relation_normal_user
- relation = create(:relation, :with_history, :version => 4)
- relation_v3 = relation.old_relations.find_by(:version => 3)
-
- auth_header = bearer_authorization_header
-
- do_redact_relation(relation_v3, create(:redaction), auth_header)
+ do_redact_redactable_relation bearer_authorization_header
assert_response :forbidden, "should need to be moderator to redact."
end
# can't be redacted.
def test_redact_relation_current_version
relation = create(:relation, :with_history, :version => 4)
- relation_latest = relation.old_relations.last
-
+ redaction = create(:redaction)
auth_header = bearer_authorization_header create(:moderator_user)
- do_redact_relation(relation_latest, create(:redaction), auth_header)
+ post relation_version_redact_path(relation, 4), :params => { :redaction => redaction.id }, :headers => auth_header
+
assert_response :bad_request, "shouldn't be OK to redact current version as moderator."
end
def test_redact_relation_moderator
relation = create(:relation, :with_history, :version => 4)
relation_v3 = relation.old_relations.find_by(:version => 3)
-
+ redaction = create(:redaction)
auth_header = bearer_authorization_header create(:moderator_user)
- do_redact_relation(relation_v3, create(:redaction), auth_header)
- assert_response :success, "should be OK to redact old version as moderator."
-
- # check moderator can still see the redacted data, when passing
- # the appropriate flag
- get api_relation_version_path(relation_v3.relation_id, relation_v3.version), :headers => auth_header
- assert_response :forbidden, "After redaction, relation should be gone for moderator, when flag not passed."
- get api_relation_version_path(relation_v3.relation_id, relation_v3.version, :show_redactions => "true"), :headers => auth_header
- assert_response :success, "After redaction, relation should not be gone for moderator, when flag passed."
-
- # and when accessed via history
- get api_relation_versions_path(relation), :headers => auth_header
- assert_response :success, "Redaction shouldn't have stopped history working."
- assert_select "osm relation[id='#{relation_v3.relation_id}'][version='#{relation_v3.version}']", 0,
- "relation #{relation_v3.relation_id} version #{relation_v3.version} should not be present in the history for moderators when not passing flag."
- get api_relation_versions_path(relation, :show_redactions => "true"), :headers => auth_header
- assert_response :success, "Redaction shouldn't have stopped history working."
- assert_select "osm relation[id='#{relation_v3.relation_id}'][version='#{relation_v3.version}']", 1,
- "relation #{relation_v3.relation_id} version #{relation_v3.version} should still be present in the history for moderators when passing flag."
- end
-
- # testing that if the moderator drops auth, he can't see the
- # redacted stuff any more.
- def test_redact_relation_is_redacted
- relation = create(:relation, :with_history, :version => 4)
- relation_v3 = relation.old_relations.find_by(:version => 3)
+ post relation_version_redact_path(*relation_v3.id), :params => { :redaction => redaction.id }, :headers => auth_header
- auth_header = bearer_authorization_header create(:moderator_user)
-
- do_redact_relation(relation_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_relation_version_path(relation_v3.relation_id, relation_v3.version), :headers => auth_header
- assert_response :forbidden, "Redacted relation shouldn't be visible via the version API."
-
- # and when accessed via history
- get api_relation_versions_path(relation), :headers => auth_header
- assert_response :success, "Redaction shouldn't have stopped history working."
- assert_select "osm relation[id='#{relation_v3.relation_id}'][version='#{relation_v3.version}']", 0,
- "redacted relation #{relation_v3.relation_id} version #{relation_v3.version} shouldn't be present in the history."
+ relation_v3.reload
+ assert_predicate relation_v3, :redacted?
+ assert_equal redaction, relation_v3.redaction
end
##
private
- ##
- # check that the current version of a relation is equivalent to the
- # version which we're getting from the versions call.
- def check_current_version(relation_id)
- # get the current version
- current_relation = with_controller(RelationsController.new) do
- get :show, :params => { :id => relation_id }
- assert_response :success, "can't get current relation #{relation_id}"
- Relation.from_xml(@response.body)
- end
- assert_not_nil current_relation, "getting relation #{relation_id} returned nil"
-
- # get the "old" version of the relation from the version method
- get :version, :params => { :id => relation_id, :version => current_relation.version }
- assert_response :success, "can't get old relation #{relation_id}, v#{current_relation.version}"
- old_relation = Relation.from_xml(@response.body)
-
- # check that the relations are identical
- assert_relations_are_equal current_relation, old_relation
- end
-
- ##
- # look at all the versions of the relation in the history and get each version from
- # the versions call. check that they're the same.
- def check_history_equals_versions(relation_id)
- get :history, :params => { :id => relation_id }
- assert_response :success, "can't get relation #{relation_id} from API"
- history_doc = XML::Parser.string(@response.body).parse
- assert_not_nil history_doc, "parsing relation #{relation_id} history failed"
-
- history_doc.find("//osm/relation").each do |relation_doc|
- history_relation = Relation.from_xml_node(relation_doc)
- assert_not_nil history_relation, "parsing relation #{relation_id} version failed"
-
- get :version, :params => { :id => relation_id, :version => history_relation.version }
- assert_response :success, "couldn't get relation #{relation_id}, v#{history_relation.version}"
- version_relation = Relation.from_xml(@response.body)
- assert_not_nil version_relation, "failed to parse #{relation_id}, v#{history_relation.version}"
-
- assert_relations_are_equal history_relation, version_relation
- end
- end
-
def do_redact_redactable_relation(headers = {})
relation = create(:relation, :with_history, :version => 4)
- relation_v3 = relation.old_relations.find_by(:version => 3)
- do_redact_relation(relation_v3, create(:redaction), headers)
- end
-
- def do_redact_relation(relation, redaction, headers = {})
- get api_relation_version_path(relation.relation_id, relation.version)
- assert_response :success, "should be able to get version #{relation.version} of relation #{relation.relation_id}."
+ redaction = create(:redaction)
- # now redact it
- post relation_version_redact_path(relation.relation_id, relation.version), :params => { :redaction => redaction.id }, :headers => headers
+ post relation_version_redact_path(relation, 3), :params => { :redaction => redaction.id }, :headers => headers
end
end
end
projects / rails.git / blobdiff