From 99d2bbccbbc6976be3029d7161d6e104a9797cf0 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 15 Mar 2017 17:13:47 +0000 Subject: [PATCH] Use redaction factory for old_relation controller tests. --- .../old_relation_controller_test.rb | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/test/controllers/old_relation_controller_test.rb b/test/controllers/old_relation_controller_test.rb index 5b531a1af..7e32ec94a 100644 --- a/test/controllers/old_relation_controller_test.rb +++ b/test/controllers/old_relation_controller_test.rb @@ -39,7 +39,7 @@ class OldRelationControllerTest < ActionController::TestCase # authorised. def test_redact_relation_unauthorised do_redact_relation(relations(:relation_with_versions_v3), - redactions(:example)) + create(:redaction)) assert_response :unauthorized, "should need to be authenticated to redact." end @@ -47,10 +47,11 @@ class OldRelationControllerTest < ActionController::TestCase # test the redaction of an old version of a relation, while being # authorised as a 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), - redactions(:example)) + create(:redaction, :user => user)) assert_response :forbidden, "should need to be moderator to redact." end @@ -58,10 +59,11 @@ class OldRelationControllerTest < ActionController::TestCase # test that, even as moderator, the current version of a relation # can't be redacted. 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), - redactions(:example)) + create(:redaction, :user => moderator_user)) assert_response :bad_request, "shouldn't be OK to redact current version as moderator." end @@ -101,10 +103,11 @@ class OldRelationControllerTest < ActionController::TestCase # test the redaction of an old version of a relation, while being # authorised as a moderator. def test_redact_relation_moderator + moderator_user = create(:moderator_user) 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." # 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 # redacted stuff any more. def test_redact_relation_is_redacted + moderator_user = create(:moderator_user) 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." # re-auth as non-moderator -- 2.43.2