Use redaction factory for old_relation controller tests.

This commit is contained in:
Andy Allan 2017-03-15 17:13:47 +00:00
parent 5422c56301
commit 99d2bbccbb

View file

@ -39,7 +39,7 @@ class OldRelationControllerTest < ActionController::TestCase
# authorised. # authorised.
def test_redact_relation_unauthorised def test_redact_relation_unauthorised
do_redact_relation(relations(:relation_with_versions_v3), do_redact_relation(relations(:relation_with_versions_v3),
redactions(:example)) create(:redaction))
assert_response :unauthorized, "should need to be authenticated to redact." assert_response :unauthorized, "should need to be authenticated to redact."
end end
@ -47,10 +47,11 @@ class OldRelationControllerTest < ActionController::TestCase
# test the redaction of an old version of a relation, while being # test the redaction of an old version of a relation, while being
# authorised as a normal user. # authorised as a normal user.
def test_redact_relation_normal_user def test_redact_relation_normal_user
basic_authorization(users(:public_user).email, "test") user = create(:user)
basic_authorization(user.email, "test")
do_redact_relation(relations(:relation_with_versions_v3), do_redact_relation(relations(:relation_with_versions_v3),
redactions(:example)) create(:redaction, :user => user))
assert_response :forbidden, "should need to be moderator to redact." assert_response :forbidden, "should need to be moderator to redact."
end end
@ -58,10 +59,11 @@ class OldRelationControllerTest < ActionController::TestCase
# test that, even as moderator, the current version of a relation # test that, even as moderator, the current version of a relation
# can't be redacted. # can't be redacted.
def test_redact_relation_current_version def test_redact_relation_current_version
basic_authorization(users(:moderator_user).email, "test") moderator_user = create(:moderator_user)
basic_authorization(moderator_user.email, "test")
do_redact_relation(relations(:relation_with_versions_v4), do_redact_relation(relations(:relation_with_versions_v4),
redactions(:example)) create(:redaction, :user => moderator_user))
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
@ -101,10 +103,11 @@ class OldRelationControllerTest < ActionController::TestCase
# test the redaction of an old version of a relation, while being # test the redaction of an old version of a relation, while being
# authorised as a moderator. # authorised as a moderator.
def test_redact_relation_moderator def test_redact_relation_moderator
moderator_user = create(:moderator_user)
relation = relations(:relation_with_versions_v3) relation = relations(:relation_with_versions_v3)
basic_authorization(users(:moderator_user).email, "test") basic_authorization(moderator_user.email, "test")
do_redact_relation(relation, redactions(:example)) do_redact_relation(relation, create(:redaction, :user => moderator_user))
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
@ -126,10 +129,11 @@ class OldRelationControllerTest < ActionController::TestCase
# 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_relation_is_redacted def test_redact_relation_is_redacted
moderator_user = create(:moderator_user)
relation = relations(:relation_with_versions_v3) relation = relations(:relation_with_versions_v3)
basic_authorization(users(:moderator_user).email, "test") basic_authorization(moderator_user.email, "test")
do_redact_relation(relation, redactions(:example)) do_redact_relation(relation, create(:redaction, :user => moderator_user))
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