From 6331e346384d3cc2639aaeec35eaa10a26f7ddf6 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Thu, 16 Mar 2017 10:21:25 +0000 Subject: [PATCH] Remove the link between the redaction owner and the user doing the redaction in tests. --- test/controllers/old_node_controller_test.rb | 20 ++++++++----------- .../old_relation_controller_test.rb | 20 ++++++++----------- test/controllers/old_way_controller_test.rb | 20 ++++++++----------- 3 files changed, 24 insertions(+), 36 deletions(-) diff --git a/test/controllers/old_node_controller_test.rb b/test/controllers/old_node_controller_test.rb index bfde15066..babb9df13 100644 --- a/test/controllers/old_node_controller_test.rb +++ b/test/controllers/old_node_controller_test.rb @@ -196,11 +196,10 @@ class OldNodeControllerTest < ActionController::TestCase # test the redaction of an old version of a node, while being # authorised as a normal user. def test_redact_node_normal_user - user = create(:user) - basic_authorization(user.email, "test") + basic_authorization(create(:user).email, "test") do_redact_node(nodes(:node_with_versions_v3), - create(:redaction, :user => user)) + create(:redaction)) assert_response :forbidden, "should need to be moderator to redact." end @@ -208,11 +207,10 @@ class OldNodeControllerTest < ActionController::TestCase # test that, even as moderator, the current version of a node # can't be redacted. def test_redact_node_current_version - moderator_user = create(:moderator_user) - basic_authorization(moderator_user.email, "test") + basic_authorization(create(:moderator_user).email, "test") do_redact_node(nodes(:node_with_versions_v4), - create(:redaction, :user => moderator_user)) + create(:redaction)) assert_response :bad_request, "shouldn't be OK to redact current version as moderator." end @@ -251,11 +249,10 @@ class OldNodeControllerTest < ActionController::TestCase # test the redaction of an old version of a node, while being # authorised as a moderator. def test_redact_node_moderator - moderator_user = create(:moderator_user) node = nodes(:node_with_versions_v3) - basic_authorization(moderator_user.email, "test") + basic_authorization(create(:moderator_user).email, "test") - do_redact_node(node, create(:redaction, :user => moderator_user)) + do_redact_node(node, create(:redaction)) assert_response :success, "should be OK to redact old version as moderator." # check moderator can still see the redacted data, when passing @@ -277,11 +274,10 @@ class OldNodeControllerTest < ActionController::TestCase # testing that if the moderator drops auth, he can't see the # redacted stuff any more. def test_redact_node_is_redacted - moderator_user = create(:moderator_user) node = nodes(:node_with_versions_v3) - basic_authorization(moderator_user.email, "test") + basic_authorization(create(:moderator_user).email, "test") - do_redact_node(node, create(:redaction, :user => moderator_user)) + do_redact_node(node, create(:redaction)) assert_response :success, "should be OK to redact old version as moderator." # re-auth as non-moderator diff --git a/test/controllers/old_relation_controller_test.rb b/test/controllers/old_relation_controller_test.rb index 7e32ec94a..1c7e691f4 100644 --- a/test/controllers/old_relation_controller_test.rb +++ b/test/controllers/old_relation_controller_test.rb @@ -47,11 +47,10 @@ 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 - user = create(:user) - basic_authorization(user.email, "test") + basic_authorization(create(:user).email, "test") do_redact_relation(relations(:relation_with_versions_v3), - create(:redaction, :user => user)) + create(:redaction)) assert_response :forbidden, "should need to be moderator to redact." end @@ -59,11 +58,10 @@ 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 - moderator_user = create(:moderator_user) - basic_authorization(moderator_user.email, "test") + basic_authorization(create(:moderator_user).email, "test") do_redact_relation(relations(:relation_with_versions_v4), - create(:redaction, :user => moderator_user)) + create(:redaction)) assert_response :bad_request, "shouldn't be OK to redact current version as moderator." end @@ -103,11 +101,10 @@ 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(moderator_user.email, "test") + basic_authorization(create(:moderator_user).email, "test") - do_redact_relation(relation, create(:redaction, :user => moderator_user)) + do_redact_relation(relation, create(:redaction)) assert_response :success, "should be OK to redact old version as moderator." # check moderator can still see the redacted data, when passing @@ -129,11 +126,10 @@ 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(moderator_user.email, "test") + basic_authorization(create(:moderator_user).email, "test") - do_redact_relation(relation, create(:redaction, :user => moderator_user)) + do_redact_relation(relation, create(:redaction)) assert_response :success, "should be OK to redact old version as moderator." # re-auth as non-moderator diff --git a/test/controllers/old_way_controller_test.rb b/test/controllers/old_way_controller_test.rb index b425be7ed..9e779abb5 100644 --- a/test/controllers/old_way_controller_test.rb +++ b/test/controllers/old_way_controller_test.rb @@ -80,11 +80,10 @@ class OldWayControllerTest < ActionController::TestCase # test the redaction of an old version of a way, while being # authorised as a normal user. def test_redact_way_normal_user - user = create(:user) - basic_authorization(user.email, "test") + basic_authorization(create(:user).email, "test") do_redact_way(ways(:way_with_versions_v3), - create(:redaction, :user => user)) + create(:redaction)) assert_response :forbidden, "should need to be moderator to redact." end @@ -92,11 +91,10 @@ class OldWayControllerTest < ActionController::TestCase # test that, even as moderator, the current version of a way # can't be redacted. def test_redact_way_current_version - moderator_user = create(:moderator_user) - basic_authorization(users(:moderator_user).email, "test") + basic_authorization(create(:moderator_user).email, "test") do_redact_way(ways(:way_with_versions_v4), - create(:redaction, :user => moderator_user)) + create(:redaction)) assert_response :bad_request, "shouldn't be OK to redact current version as moderator." end @@ -136,11 +134,10 @@ class OldWayControllerTest < ActionController::TestCase # test the redaction of an old version of a way, while being # authorised as a moderator. def test_redact_way_moderator - moderator_user = create(:moderator_user) way = ways(:way_with_versions_v3) - basic_authorization(moderator_user.email, "test") + basic_authorization(create(:moderator_user).email, "test") - do_redact_way(way, create(:redaction, :user => moderator_user)) + do_redact_way(way, create(:redaction)) assert_response :success, "should be OK to redact old version as moderator." # check moderator can still see the redacted data, when passing @@ -162,11 +159,10 @@ class OldWayControllerTest < ActionController::TestCase # testing that if the moderator drops auth, he can't see the # redacted stuff any more. def test_redact_way_is_redacted - moderator_user = create(:moderator_user) way = ways(:way_with_versions_v3) - basic_authorization(moderator_user.email, "test") + basic_authorization(create(:moderator_user).email, "test") - do_redact_way(way, create(:redaction, :user => moderator_user)) + do_redact_way(way, create(:redaction)) assert_response :success, "should be OK to redact old version as moderator." # re-auth as non-moderator -- 2.43.2