matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Organization related improvements to the permissions app tests.

Browse Source
This commit is contained in:
Roberto Rosario
2016-05-25 02:51:32 -04:00
parent eab5296c7a
commit 07a124187f
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mayan/apps/permissions/tests/test_models.py
View File

@@ -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(

20
mayan/apps/permissions/tests/test_views.py
View File

@@ -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
)