chore: dont set model id for an instance during testing

ref: #813
This commit is contained in:
2025-06-10 14:23:05 +09:30
parent f44fb28b8d
commit 4f5a4c4124
4 changed files with 2 additions and 146 deletions

View File

@ -97,7 +97,6 @@ class MetaAbstractModelInheritedCases(
instance = audit_model()
instance.id = 1
model_instance.id = 1
model_instance.model = instance
url_basename = f'v2:_api_centurionaudit_sub-detail'
@ -128,7 +127,6 @@ class MetaAbstractModelInheritedCases(
instance = audit_model()
instance.id = 1
model_instance.id = 1
model_instance.model = instance
url = model_instance.get_url_kwargs()
@ -241,7 +239,6 @@ class MetaAbstractModelPyTest(
Ensure method `get_url_kwargs` returns the correct value.
"""
model_instance.id = 1
model_instance.model = model_instance
url = model_instance.get_url_kwargs()

View File

@ -52,7 +52,6 @@ class MetaAbstractModelTestCases(
model_instance.objects = MockManager()
model_instance.model = None
# clean_fields = mocker.patch('core.models.centurion_notes.NoteMetaModel.clean_fields', return_value = None)
with pytest.raises( ValidationError ) as e:
model_instance.clean_fields()
@ -127,7 +126,6 @@ class MetaAbstractModelInheritedCases(
instance = note_model()
instance.id = 1
model_instance.id = 1
model_instance.model = instance
url_basename = f'v2:_api_centurionmodelnote_sub-detail'
@ -158,7 +156,6 @@ class MetaAbstractModelInheritedCases(
instance = note_model()
instance.id = 1
model_instance.id = 1
model_instance.model = instance
url = model_instance.get_url_kwargs()
@ -185,7 +182,6 @@ class MetaAbstractModelInheritedCases(
if type(note_model.organization) is not property:
instance.organization = organization_one
model_instance.id = 1
model_instance.model = instance
model_instance.clean_fields()
@ -203,7 +199,6 @@ class MetaAbstractModelPyTest(
Ensure method `get_url_kwargs` returns the correct value.
"""
model_instance.id = 1
model_instance.model = model_instance
url = model_instance.get_url_kwargs()

View File

@ -32,7 +32,6 @@ class CenturionSubAbstractModelTestCases(
reverse = mocker.patch('rest_framework.reverse._reverse', return_value = site_path)
model_instance.id = 1
model_instance.model = model_instance
@ -69,7 +68,6 @@ class CenturionSubAbstractModelTestCases(
Ensure method `get_url_kwargs` returns the correct value.
"""
model_instance.id = 1
model_instance.model = model_instance
url = model_instance.get_url_kwargs()

View File

@ -120,15 +120,6 @@ class CenturionMixnTestCases(
def get(*args, **kwargs):
return model_instance
# def get_queryset(self):
# return model_instance
# mocker.patch(
# 'access.models.tenancy_abstract.TenancyAbstractModel.objects',
# new_callable=MockManager
# )
mocker.patch(
'django.db.models.query.QuerySet.get', return_value = model_instance
)
@ -156,13 +147,6 @@ class CenturionMixnTestCases(
audit name `<Model Class name>AuditHistory`
"""
# class MockManager:
# def get(*args, **kwargs):
# return model_instance
# model_instance.objects = MockManager()
mocker.patch(
'django.db.models.query.QuerySet.get', return_value = model_instance
)
@ -359,14 +343,6 @@ class CenturionMixnPyTest(
is enabled.
"""
# class MockManager:
# def get(*args, **kwargs):
# return model_instance
# model_instance.objects = MockManager()
# mocker.patch('core.mixins.centurion.Centurion.objects', new_callable=MockManager)
mocker.patch(
'django.db.models.query.QuerySet.get', return_value = model_instance
)
@ -409,13 +385,6 @@ class CenturionMixnPyTest(
when model is not a sub-model
"""
# class MockManager:
# def get(*args, **kwargs):
# return model_instance
# mocker.patch('access.models.tenancy_abstract.TenancyAbstractModel.objects', new_callable=MockManager)
mocker.patch(
'django.db.models.query.QuerySet.get', return_value = model_instance
)
@ -440,13 +409,6 @@ class CenturionMixnPyTest(
when model is not a sub-model
"""
# class MockManager:
# def get(*args, **kwargs):
# return model_instance
# mocker.patch('access.models.tenancy_abstract.TenancyAbstractModel.objects', new_callable=MockManager)
mocker.patch(
'django.db.models.query.QuerySet.get', return_value = model_instance
)
@ -474,13 +436,6 @@ class CenturionMixnPyTest(
`self.get_audit_values()` must not be called.
"""
# class MockManager:
# def get(*args, **kwargs):
# return model_instance
# mocker.patch('access.models.tenancy_abstract.TenancyAbstractModel.objects', new_callable=MockManager)
mocker.patch(
'django.db.models.query.QuerySet.get', return_value = model_instance
)
@ -666,14 +621,6 @@ class CenturionMixnPyTest(
setattr(model_instance, field, value)
# class MockManager:
# def get(*args, **kwargs):
# return model_instance
# mocker.patch('access.models.tenancy_abstract.TenancyAbstractModel.objects', new_callable=MockManager)
mocker.patch(
'django.db.models.query.QuerySet.get', return_value = model_instance
)
@ -698,8 +645,6 @@ class CenturionMixnPyTest(
model_instance.objects = MockManager()
model_instance.id = 1
for field in self.kwargs_create_item:
setattr(model_instance, field, self.kwargs_create_item[field])
@ -711,7 +656,8 @@ class CenturionMixnPyTest(
**self.kwargs_create_item,
} # Correct Values Returned
assert len(method_values) == len(model_instance._meta.fields) # Fail-Safe to ensure test writer fills all fields
assert len(method_values) == len(model_instance._meta.fields)
# Fail-Safe to ensure test writer fills all fields
@ -787,7 +733,6 @@ class CenturionMixnPyTest(
reverse = mocker.patch('rest_framework.reverse._reverse', return_value = 'None')
model_instance.id = 1
url_basename = f'v2:_api_{model_instance._meta.model_name}-detail'
url = model_instance.get_url()
@ -810,8 +755,6 @@ class CenturionMixnPyTest(
test_value = settings.SITE_URL + site_path
model_instance.id = 1
url = model_instance.get_url( relative = False)
assert url == test_value
@ -828,8 +771,6 @@ class CenturionMixnPyTest(
reverse = mocker.patch('rest_framework.reverse._reverse', return_value = site_path)
model_instance.id = 1
url = model_instance.get_url( relative = True)
assert url == site_path
@ -846,7 +787,6 @@ class CenturionMixnPyTest(
reverse = mocker.patch('rest_framework.reverse._reverse', return_value = site_path)
model_instance.id = 1
model_instance.url_model_name = 'testmodel'
url_basename = f'v2:_api_testmodel-detail'
@ -866,13 +806,6 @@ class CenturionMixnPyTest(
`self.get_audit_values()`.
"""
# class MockManager:
# def get(*args, **kwargs):
# return model_instance
# model_instance.objects = MockManager()
mocker.patch(
'django.db.models.query.QuerySet.get', return_value = model_instance
)
@ -886,11 +819,6 @@ class CenturionMixnPyTest(
password = 'password'
)
# mocker.patch('core.mixins.centurion.Centurion.context', return_value = {
# 'user': user,
# 'logger': None
# })
model_instance.context['user'] = user
mocker.patch('core.mixins.centurion.Centurion.full_clean', return_value = None)
@ -913,13 +841,6 @@ class CenturionMixnPyTest(
Ensure method `save` sets attribute `self._before` with an empty dict for new model
"""
# class MockManager:
# def get(*args, **kwargs):
# return model_instance
# model_instance.objects = MockManager()
mocker.patch(
'django.db.models.query.QuerySet.get', return_value = model_instance
)
@ -931,11 +852,6 @@ class CenturionMixnPyTest(
password = 'password'
)
# mocker.patch('core.mixins.centurion.Centurion.context', return_value = {
# 'user': user,
# 'logger': None
# })
model_instance.context['user'] = user
mocker.patch('django.db.models.base.Model.save', return_value = None)
@ -957,36 +873,17 @@ class CenturionMixnPyTest(
`self.get_audit_values()`.
"""
# class MockManager:
# class MockObj:
# def get_audit_values(self):
# return {}
# def get(self, *args, **kwargs):
# return self.MockObj()
user = model_user.objects.create(
username = 'centurion_abstract',
password = 'password'
)
# mocker.patch('core.mixins.centurion.Centurion.context', return_value = {
# 'user': user,
# 'logger': None
# })
model_instance.context['user'] = user
# mocker.patch('access.models.tenancy_abstract.TenancyAbstractModel.objects', new_callable=MockManager)
mocker.patch(
'django.db.models.query.QuerySet.get', return_value = model_instance
)
model_instance.id = 1
model_instance._audit_enabled = True
mocker.patch('django.db.models.base.Model.save', return_value = None)
@ -1016,30 +913,13 @@ class CenturionMixnPyTest(
'id': 1
}
# class MockManager:
# class MockObj:
# def get_audit_values(self):
# return test_value
# def get(self, *args, **kwargs):
# return self.MockObj()
user = model_user.objects.create(
username = 'centurion_abstract',
password = 'password'
)
# mocker.patch('core.mixins.centurion.Centurion.context', return_value = {
# 'user': user,
# 'logger': None
# })
model_instance.context['user'] = user
# mocker.patch('access.models.tenancy_abstract.TenancyAbstractModel.objects', new_callable=MockManager)
mocker.patch(
'django.db.models.query.QuerySet.get', return_value = model_instance
)
@ -1052,8 +932,6 @@ class CenturionMixnPyTest(
mocker.patch('core.mixins.centurion.Centurion.full_clean', return_value = None)
# mocker.patch('core.mixins.centurion.Centurion.get_audit_values', return_value = None)
model_instance.save()
assert model_instance._before == test_value
@ -1148,13 +1026,6 @@ class CenturionMixnPyTest(
Ensure method `save` calls `self.get_audit_values()` with the defined attributes.
"""
# class MockManager:
# def get(*args, **kwargs):
# return model_instance
# model_instance.objects = MockManager()
mocker.patch(
'django.db.models.query.QuerySet.get', return_value = model_instance
)
@ -1166,11 +1037,6 @@ class CenturionMixnPyTest(
password = 'password'
)
# mocker.patch('core.mixins.centurion.Centurion.context', return_value = {
# 'user': user,
# 'logger': None
# })
model_instance.context['user'] = user
mocker.patch('django.db.models.base.Model.save', return_value = None)