From da2ff0bdd8970a6548e9567f18ea6bcace9e52aa Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 5 Mar 2019 20:32:31 -0400 Subject: [PATCH] Allowing adding an additional test permission For tests that required using two test permission, like the tests for .restrict_queryset_by_accesses(). Signed-off-by: Roberto Rosario --- mayan/apps/permissions/tests/literals.py | 4 ++++ mayan/apps/permissions/tests/mixins.py | 17 ++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/mayan/apps/permissions/tests/literals.py b/mayan/apps/permissions/tests/literals.py index f81c7f4a3d..628a88b604 100644 --- a/mayan/apps/permissions/tests/literals.py +++ b/mayan/apps/permissions/tests/literals.py @@ -7,5 +7,9 @@ TEST_PERMISSION_NAMESPACE_LABEL = 'test permission namespace label' TEST_PERMISSION_NAMESPACE_NAME = 'test_permission_namespace_name' TEST_PERMISSION_LABEL = 'test permission name label' TEST_PERMISSION_NAME = '{}.{}'.format(TEST_PERMISSION_NAMESPACE_NAME, 'test_permission_name') +TEST_PERMISSION_NAMESPACE_LABEL_2 = 'test permission namespace label 2' +TEST_PERMISSION_NAMESPACE_NAME_2 = 'test_permission_namespace_name_2' +TEST_PERMISSION_LABEL_2 = 'test permission name label 2' +TEST_PERMISSION_NAME_2 = '{}.{}'.format(TEST_PERMISSION_NAMESPACE_NAME_2, 'test_permission_name') TEST_ROLE_LABEL = 'test role label' TEST_ROLE_LABEL_EDITED = 'test role label edited' diff --git a/mayan/apps/permissions/tests/mixins.py b/mayan/apps/permissions/tests/mixins.py index 8dd5442da4..a210376009 100644 --- a/mayan/apps/permissions/tests/mixins.py +++ b/mayan/apps/permissions/tests/mixins.py @@ -4,9 +4,10 @@ from ..classes import PermissionNamespace from ..models import Role from .literals import ( - TEST_CASE_ROLE_LABEL, TEST_PERMISSION_LABEL, TEST_PERMISSION_NAME, - TEST_PERMISSION_NAMESPACE_LABEL, TEST_PERMISSION_NAMESPACE_NAME, - TEST_ROLE_LABEL + TEST_CASE_ROLE_LABEL, TEST_PERMISSION_LABEL, TEST_PERMISSION_LABEL_2, + TEST_PERMISSION_NAME, TEST_PERMISSION_NAME_2, TEST_PERMISSION_NAMESPACE_LABEL, + TEST_PERMISSION_NAMESPACE_LABEL_2, TEST_PERMISSION_NAMESPACE_NAME, + TEST_PERMISSION_NAMESPACE_NAME_2, TEST_ROLE_LABEL ) @@ -21,6 +22,16 @@ class PermissionTestMixin(object): name=TEST_PERMISSION_NAME ) + def _create_test_permission_2(self): + self.test_permission_namespace_2 = PermissionNamespace( + label=TEST_PERMISSION_NAMESPACE_LABEL_2, + name=TEST_PERMISSION_NAMESPACE_NAME_2 + ) + self.test_permission_2 = self.test_permission_namespace_2.add_permission( + label=TEST_PERMISSION_LABEL_2, + name=TEST_PERMISSION_NAME_2 + ) + class RoleTestCaseMixin(object): def setUp(self):