From 025bf1acf0d3fdb323a304249848cf65ae03bd72 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Mon, 11 Jan 2021 10:59:38 +0100 Subject: [PATCH 3/4] tests: use pytest style (#49957) --- tests/test_custom_user.py | 74 ++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 40 deletions(-) diff --git a/tests/test_custom_user.py b/tests/test_custom_user.py index a4aa6f6c..870baaca 100644 --- a/tests/test_custom_user.py +++ b/tests/test_custom_user.py @@ -14,10 +14,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from django.test import TestCase -from django.contrib.contenttypes.models import ContentType from django.contrib.auth import get_user_model -from django.core.exceptions import ValidationError from django_rbac.utils import get_permission_model, get_role_model @@ -26,42 +23,39 @@ Role = get_role_model() User = get_user_model() -class CustomUserTestCase(TestCase): - def test_roles_and_parents(self): - rchild1 = Role.objects.create(name='role-child1') - rparent1 = Role.objects.create(name='role-parent1') - rparent2 = Role.objects.create(name='role-parent2') - rchild2 = Role.objects.create(name='role-child2') - rparent1.add_child(rchild1) - rparent1.add_child(rchild2) - rparent2.add_child(rchild1) - rparent2.add_child(rchild2) +def test_roles_and_parents(db): + rchild1 = Role.objects.create(name='role-child1') + rparent1 = Role.objects.create(name='role-parent1') + rparent2 = Role.objects.create(name='role-parent2') + rchild2 = Role.objects.create(name='role-child2') + rparent1.add_child(rchild1) + rparent1.add_child(rchild2) + rparent2.add_child(rchild1) + rparent2.add_child(rchild2) - user1 = User.objects.create(username='user') - user1.roles.add(rchild1) - self.assertEqual(set([r.id for r in user1.roles_and_parents()]), - set([rchild1.id, rparent1.id, rparent2.id])) - for r in user1.roles_and_parents(): - if r.id == rchild1.id: - self.assertEqual(r.member, [user1]) - else: - self.assertIn(r.id, [rparent1.id, rparent2.id]) - self.assertEqual(r.member, []) - user1.roles.remove(rchild1) - user1.roles.add(rchild2) - self.assertEqual(set([r.id for r in user1.roles_and_parents()]), - set([rchild2.id, rparent1.id, rparent2.id])) - for r in user1.roles_and_parents(): - if r.id == rchild2.id: - self.assertEqual(r.member, [user1]) - else: - self.assertIn(r.id, [rparent1.id, rparent2.id]) - self.assertEqual(r.member, []) + user1 = User.objects.create(username='user') + user1.roles.add(rchild1) + assert set([r.id for r in user1.roles_and_parents()]) == set([rchild1.id, rparent1.id, rparent2.id]) + for r in user1.roles_and_parents(): + if r.id == rchild1.id: + assert r.member == [user1] + else: + assert r.id in [rparent1.id, rparent2.id] + assert r.member == [] + user1.roles.remove(rchild1) + user1.roles.add(rchild2) + assert set([r.id for r in user1.roles_and_parents()]) == set([rchild2.id, rparent1.id, rparent2.id]) + for r in user1.roles_and_parents(): + if r.id == rchild2.id: + assert r.member == [user1] + else: + assert r.id in [rparent1.id, rparent2.id] + assert r.member == [] - def test_user_mark_as_deleted(self): - user1 = User.objects.create(username='foo', email='foo@example.net') - user1.mark_as_deleted() - user2 = User.objects.create(username='foo2', email='foo@example.net') - assert len(User.objects.filter(email='foo@example.net')) == 2 - assert len(User.objects.filter( - email='foo@example.net', deleted__isnull=True)) == 1 + +def test_user_mark_as_deleted(db): + user1 = User.objects.create(username='foo', email='foo@example.net') + user1.mark_as_deleted() + User.objects.create(username='foo2', email='foo@example.net') + assert len(User.objects.filter(email='foo@example.net')) == 2 + assert len(User.objects.filter(email='foo@example.net', deleted__isnull=True)) == 1 -- 2.29.2