Fix failing tests.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2017-08-27 19:48:30 -04:00
parent bdb8ea18a2
commit 275229cd52
3 changed files with 16 additions and 29 deletions
+2 -28
View File
@@ -6,7 +6,6 @@ from django.test import TestCase
from django_downloadview import assert_download_response from django_downloadview import assert_download_response
from acls.models import AccessControlList
from permissions.classes import Permission from permissions.classes import Permission
from permissions.models import Role from permissions.models import Role
from permissions.tests.literals import TEST_ROLE_LABEL from permissions.tests.literals import TEST_ROLE_LABEL
@@ -17,11 +16,11 @@ from user_management.tests import (
) )
from .mixins import ( from .mixins import (
ContentTypeCheckMixin, OpenFileCheckMixin, TempfileCheckMixin ContentTypeCheckMixin, OpenFileCheckMixin, TempfileCheckMixin, UserMixin
) )
class BaseTestCase(ContentTypeCheckMixin, OpenFileCheckMixin, TempfileCheckMixin, TestCase): class BaseTestCase(UserMixin, ContentTypeCheckMixin, OpenFileCheckMixin, TempfileCheckMixin, TestCase):
""" """
This is the most basic test case class any test in the project should use. This is the most basic test case class any test in the project should use.
""" """
@@ -31,28 +30,3 @@ class BaseTestCase(ContentTypeCheckMixin, OpenFileCheckMixin, TempfileCheckMixin
super(BaseTestCase, self).setUp() super(BaseTestCase, self).setUp()
Namespace.invalidate_cache_all() Namespace.invalidate_cache_all()
Permission.invalidate_cache() Permission.invalidate_cache()
self.admin_user = get_user_model().objects.create_superuser(
username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL,
password=TEST_ADMIN_PASSWORD
)
self.user = get_user_model().objects.create_user(
username=TEST_USER_USERNAME, email=TEST_USER_EMAIL,
password=TEST_USER_PASSWORD
)
self.group = Group.objects.create(name=TEST_GROUP_NAME)
self.role = Role.objects.create(label=TEST_ROLE_LABEL)
self.group.user_set.add(self.user)
self.role.groups.add(self.group)
def grant_access(self, permission, obj):
AccessControlList.objects.grant(
permission=permission, role=self.role, obj=obj
)
def grant_permission(self, permission):
self.role.permissions.add(
permission.stored_permission
)
+13
View File
@@ -6,8 +6,11 @@ import os
from django.conf import settings from django.conf import settings
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
from django.contrib.auth.models import Group from django.contrib.auth.models import Group
if getattr(settings, 'COMMON_TEST_FILE_HANDLES', False): if getattr(settings, 'COMMON_TEST_FILE_HANDLES', False):
import psutil import psutil
from acls.models import AccessControlList
from permissions.models import Role from permissions.models import Role
from permissions.tests.literals import TEST_ROLE_LABEL from permissions.tests.literals import TEST_ROLE_LABEL
from user_management.tests import ( from user_management.tests import (
@@ -130,3 +133,13 @@ class UserMixin(object):
self.role = Role.objects.create(label=TEST_ROLE_LABEL) self.role = Role.objects.create(label=TEST_ROLE_LABEL)
self.group.user_set.add(self.user) self.group.user_set.add(self.user)
self.role.groups.add(self.group) self.role.groups.add(self.group)
def grant_access(self, permission, obj):
AccessControlList.objects.grant(
permission=permission, role=self.role, obj=obj
)
def grant_permission(self, permission):
self.role.permissions.add(
permission.stored_permission
)
@@ -20,7 +20,7 @@ from .literals import (
@override_settings(OCR_AUTO_OCR=False) @override_settings(OCR_AUTO_OCR=False)
class DocumentStateIndexingTestCase(UserMixin, BaseTestCase): class DocumentStateIndexingTestCase(BaseTestCase):
def tearDown(self): def tearDown(self):
self.document_type.delete() self.document_type.delete()
super(DocumentStateIndexingTestCase, self).tearDown() super(DocumentStateIndexingTestCase, self).tearDown()