@ -5,7 +5,7 @@ from django.db import models
|
||||
|
||||
from centurion.tests.unit_models import ModelTestCases
|
||||
|
||||
from access.models.tenancy_abstract import TenancyAbstractModel
|
||||
from access.models import tenancy_abstract
|
||||
|
||||
|
||||
|
||||
@ -62,7 +62,7 @@ class TenancyAbstractModelTestCases(
|
||||
Ensure this model inherits from `TenancyAbstractModel`
|
||||
"""
|
||||
|
||||
assert issubclass(model, TenancyAbstractModel)
|
||||
assert issubclass(model, tenancy_abstract.TenancyAbstractModel)
|
||||
|
||||
|
||||
|
||||
|
@ -811,7 +811,7 @@ class ModelViewSetBaseCases(
|
||||
|
||||
self.organization = Organization.objects.create(name='test_org')
|
||||
|
||||
self.view_user = User.objects.create_user(username="test_view_user", password="password", is_superuser=True)
|
||||
self.view_user = User.objects.create_user(username="test_view_user1278", password="password", is_superuser=True)
|
||||
|
||||
|
||||
@classmethod
|
||||
|
@ -36,7 +36,7 @@ class ModelTestCases:
|
||||
|
||||
with django_db_blocker.unblock():
|
||||
|
||||
default_val = None
|
||||
default_val = model.context['user']
|
||||
|
||||
model.context['user'] = user
|
||||
|
||||
|
@ -76,8 +76,8 @@ class ClassTestCases:
|
||||
|
||||
if type(getattr(test_class, param_field_name)) is property:
|
||||
|
||||
assert getattr(test_class, param_field_name).fget(test_class) == param_value
|
||||
assert getattr(test_class, param_field_name).fget(test_class) == param_value, getattr(test_class, param_field_name).fget(test_class)
|
||||
|
||||
else:
|
||||
|
||||
assert getattr(test_class, param_field_name) == param_value
|
||||
assert getattr(test_class, param_field_name) == param_value, getattr(test_class, param_field_name)
|
||||
|
@ -241,10 +241,6 @@ class CenturionAbstractModelInheritedCases(
|
||||
|
||||
def test_model_creation(self, model, user):
|
||||
|
||||
default_val = model.context['user']
|
||||
|
||||
model.context['user'] = user
|
||||
|
||||
kwargs = {}
|
||||
|
||||
many_field = {}
|
||||
@ -272,10 +268,16 @@ class CenturionAbstractModelInheritedCases(
|
||||
})
|
||||
|
||||
|
||||
default_val = model.context['user']
|
||||
|
||||
model.context['user'] = user
|
||||
|
||||
model_object = model.objects.create(
|
||||
**kwargs
|
||||
)
|
||||
|
||||
model.context['user'] = default_val
|
||||
|
||||
for field, values in many_field.items():
|
||||
|
||||
for value in values:
|
||||
@ -283,8 +285,6 @@ class CenturionAbstractModelInheritedCases(
|
||||
getattr(model_object, field).add( value )
|
||||
|
||||
|
||||
model.context['user'] = default_val
|
||||
|
||||
assert type(model_object.id) is int
|
||||
|
||||
|
||||
|
@ -126,7 +126,7 @@ def api_request_permissions( django_db_blocker,
|
||||
view_team.permissions.set([view_permissions])
|
||||
|
||||
view_user = model_user.objects.create_user(
|
||||
username="test_user_view" + str(random_str), password="password"
|
||||
username="api_r_perm_user_view" + str(random_str), password="password"
|
||||
)
|
||||
|
||||
model_teamuser.objects.create(
|
||||
|
20
app/tests/fixtures/model_instance.py
vendored
20
app/tests/fixtures/model_instance.py
vendored
@ -34,9 +34,6 @@ def model_instance(django_db_blocker, model_user, model, model_kwargs):
|
||||
|
||||
obj = None
|
||||
|
||||
if user:
|
||||
model.context['user'] = user
|
||||
|
||||
|
||||
if model._meta.abstract:
|
||||
|
||||
@ -90,10 +87,19 @@ def model_instance(django_db_blocker, model_user, model, model_kwargs):
|
||||
random_field: str( random_field ) + '_' + random_str
|
||||
})
|
||||
|
||||
|
||||
model_context_user_default = model.context['user']
|
||||
|
||||
if user:
|
||||
model.context['user'] = user
|
||||
|
||||
|
||||
obj = model.objects.create(
|
||||
**kwargs
|
||||
)
|
||||
|
||||
model.context['user'] = model_context_user_default
|
||||
|
||||
|
||||
for field, values in many_field.items():
|
||||
|
||||
@ -106,17 +112,23 @@ def model_instance(django_db_blocker, model_user, model, model_kwargs):
|
||||
|
||||
return obj
|
||||
|
||||
yield instance
|
||||
yield instance
|
||||
|
||||
with django_db_blocker.unblock():
|
||||
|
||||
for model_obj in model_objs:
|
||||
|
||||
if model_obj._meta.abstract:
|
||||
|
||||
model_obj.context['user'] = None
|
||||
|
||||
del model_obj
|
||||
|
||||
else:
|
||||
|
||||
try:
|
||||
model_obj.context['user'] = None
|
||||
|
||||
model_obj.delete()
|
||||
except:
|
||||
pass
|
||||
|
5
app/tests/fixtures/model_knowledgebase.py
vendored
5
app/tests/fixtures/model_knowledgebase.py
vendored
@ -39,6 +39,7 @@ def kwargs_knowledgebase(django_db_blocker,
|
||||
name = 'kb cat for kb art' + random_str
|
||||
)
|
||||
|
||||
category.context['user'] = default_context_user
|
||||
model_knowledgebasecategory.context['user'] = default_context_user
|
||||
|
||||
kwargs = {
|
||||
@ -57,7 +58,9 @@ def kwargs_knowledgebase(django_db_blocker,
|
||||
'modified': '2024-06-03T23:00:00Z',
|
||||
}
|
||||
|
||||
yield kwargs.copy()
|
||||
yield kwargs.copy()
|
||||
|
||||
with django_db_blocker.unblock():
|
||||
|
||||
team.delete()
|
||||
|
||||
|
@ -32,6 +32,8 @@ def kwargs_knowledgebasecategory(django_db_blocker, kwargs_centurionmodel, model
|
||||
'modified': '2024-06-03T23:00:00Z',
|
||||
}
|
||||
|
||||
yield kwargs.copy()
|
||||
yield kwargs.copy()
|
||||
|
||||
with django_db_blocker.unblock():
|
||||
|
||||
user.delete()
|
||||
|
7
app/tests/fixtures/model_tenancyabstract.py
vendored
7
app/tests/fixtures/model_tenancyabstract.py
vendored
@ -1,13 +1,14 @@
|
||||
import pytest
|
||||
|
||||
from access.models.tenancy_abstract import TenancyAbstractModel
|
||||
from importlib import reload
|
||||
|
||||
from access.models import tenancy_abstract
|
||||
|
||||
|
||||
@pytest.fixture( scope = 'class')
|
||||
def model_tenancyabstract(request):
|
||||
def model_tenancyabstract():
|
||||
|
||||
yield TenancyAbstractModel
|
||||
yield reload(tenancy_abstract).TenancyAbstractModel
|
||||
|
||||
|
||||
@pytest.fixture( scope = 'class')
|
||||
|
Reference in New Issue
Block a user