From 07a124187fa5792bc5008e63a189015f29004053 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 25 May 2016 02:51:32 -0400 Subject: [PATCH] Organization related improvements to the permissions app tests. --- mayan/apps/permissions/tests/test_models.py | 12 +++++++----- mayan/apps/permissions/tests/test_views.py | 20 ++++++++++++-------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/mayan/apps/permissions/tests/test_models.py b/mayan/apps/permissions/tests/test_models.py index cdd494d45a..78bae6a743 100644 --- a/mayan/apps/permissions/tests/test_models.py +++ b/mayan/apps/permissions/tests/test_models.py @@ -1,10 +1,11 @@ from __future__ import unicode_literals from django.contrib.auth import get_user_model -from django.contrib.auth.models import Group from django.core.exceptions import PermissionDenied from django.test import TestCase +from organizations.utils import create_default_organization +from user_management.models import MayanGroup from user_management.tests import TEST_GROUP, TEST_USER_USERNAME from ..classes import Permission @@ -16,11 +17,12 @@ from .literals import TEST_ROLE_LABEL class PermissionTestCase(TestCase): def setUp(self): - self.user = get_user_model().objects.create( + create_default_organization() + self.user = get_user_model().on_organization.create( username=TEST_USER_USERNAME ) - self.group = Group.objects.create(name=TEST_GROUP) - self.role = Role.objects.create(label=TEST_ROLE_LABEL) + self.group = MayanGroup.on_organization.create(name=TEST_GROUP) + self.role = Role.on_organization.create(label=TEST_ROLE_LABEL) Permission.invalidate_cache() def test_no_permissions(self): @@ -32,7 +34,7 @@ class PermissionTestCase(TestCase): def test_with_permissions(self): self.group.user_set.add(self.user) self.role.permissions.add(permission_role_view.stored_permission) - self.role.groups.add(self.group) + self.role.organization_groups.add(self.group) try: Permission.check_permissions( diff --git a/mayan/apps/permissions/tests/test_views.py b/mayan/apps/permissions/tests/test_views.py index 10553f2d88..fe424e8bd2 100644 --- a/mayan/apps/permissions/tests/test_views.py +++ b/mayan/apps/permissions/tests/test_views.py @@ -5,6 +5,7 @@ from django.core.urlresolvers import reverse from django.test.client import Client from django.test import TestCase +from organizations.utils import create_default_organization from user_management.tests import ( TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL ) @@ -16,7 +17,8 @@ from .literals import TEST_ROLE_LABEL, TEST_ROLE_LABEL_EDITED class PermissionsViewsTestCase(TestCase): def setUp(self): - self.admin_user = get_user_model().objects.create_superuser( + create_default_organization() + self.admin_user = get_user_model().on_organization.create_superuser( username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL, password=TEST_ADMIN_PASSWORD ) @@ -39,11 +41,11 @@ class PermissionsViewsTestCase(TestCase): self.assertContains(response, 'created', status_code=200) - self.assertEqual(Role.objects.count(), 1) - self.assertEqual(Role.objects.first().label, TEST_ROLE_LABEL) + self.assertEqual(Role.on_organization.count(), 1) + self.assertEqual(Role.on_organization.first().label, TEST_ROLE_LABEL) def test_role_delete_view(self): - role = Role.objects.create(label=TEST_ROLE_LABEL) + role = Role.on_organization.create(label=TEST_ROLE_LABEL) response = self.client.post( reverse( @@ -53,10 +55,10 @@ class PermissionsViewsTestCase(TestCase): self.assertContains(response, 'deleted', status_code=200) - self.assertEqual(Role.objects.count(), 0) + self.assertEqual(Role.on_organization.count(), 0) def test_role_edit_view(self): - role = Role.objects.create(label=TEST_ROLE_LABEL) + role = Role.on_organization.create(label=TEST_ROLE_LABEL) response = self.client.post( reverse( @@ -68,5 +70,7 @@ class PermissionsViewsTestCase(TestCase): self.assertContains(response, 'update', status_code=200) - self.assertEqual(Role.objects.count(), 1) - self.assertEqual(Role.objects.first().label, TEST_ROLE_LABEL_EDITED) + self.assertEqual(Role.on_organization.count(), 1) + self.assertEqual( + Role.on_organization.first().label, TEST_ROLE_LABEL_EDITED + )