refactor(accounting): Update URL route name for AssetBase model
ref: #862 #857
This commit is contained in:
@ -1,5 +0,0 @@
|
||||
from .asset_base_history import AssetBaseHistory # pylint: disable=W0611:unused-import
|
||||
|
||||
from .asset_base_history import AssetBaseHistory # pylint: disable=W0611:unused-import
|
||||
|
||||
from .asset_base_notes import AssetBaseNotes # pylint: disable=W0611:unused-import
|
||||
|
@ -237,7 +237,7 @@ class AssetBaseMetadataInheritedCases(
|
||||
|
||||
kwargs_create_item_diff_org: dict = {}
|
||||
|
||||
url_name = 'accounting:_api_v2_asset_sub'
|
||||
url_name = 'accounting:_api_asset_sub'
|
||||
|
||||
|
||||
@classmethod
|
||||
@ -272,4 +272,4 @@ class AssetBaseMetadataTest(
|
||||
|
||||
):
|
||||
|
||||
url_name = 'accounting:_api_v2_asset'
|
||||
url_name = 'accounting:_api_asset'
|
||||
|
@ -37,7 +37,7 @@ class PermissionsAPITestCases(
|
||||
|
||||
url_kwargs: dict = {}
|
||||
|
||||
url_name = 'accounting:_api_v2_asset'
|
||||
url_name = 'accounting:_api_asset'
|
||||
|
||||
url_view_kwargs: dict = {}
|
||||
|
||||
@ -66,7 +66,7 @@ class AssetBasePermissionsAPIInheritedCases(
|
||||
|
||||
kwargs_create_item_diff_org: dict = None
|
||||
|
||||
url_name = 'accounting:_api_v2_asset_sub'
|
||||
url_name = 'accounting:_api_asset_sub'
|
||||
|
||||
|
||||
@pytest.fixture(scope='class')
|
||||
|
@ -240,7 +240,7 @@ class AssetBaseViewSetInheritedCases(
|
||||
|
||||
model = None
|
||||
|
||||
url_name = 'accounting:_api_v2_asset_sub'
|
||||
url_name = 'accounting:_api_asset_sub'
|
||||
|
||||
|
||||
@classmethod
|
||||
@ -274,4 +274,4 @@ class AssetBaseViewSetTest(
|
||||
TestCase,
|
||||
):
|
||||
|
||||
url_name = 'accounting:_api_v2_asset'
|
||||
url_name = 'accounting:_api_asset'
|
||||
|
@ -1,14 +1,19 @@
|
||||
import pytest
|
||||
|
||||
from accounting.models.asset_base import AssetBase
|
||||
|
||||
|
||||
|
||||
@pytest.fixture( scope = 'class')
|
||||
def model(request):
|
||||
def model(model_assetbase):
|
||||
|
||||
request.cls.model = AssetBase
|
||||
yield model_assetbase
|
||||
|
||||
yield request.cls.model
|
||||
|
||||
del request.cls.model
|
||||
@pytest.fixture( scope = 'class', autouse = True)
|
||||
def model_kwargs(request, kwargs_assetbase):
|
||||
|
||||
request.cls.kwargs_create_item = kwargs_assetbase.copy()
|
||||
|
||||
yield kwargs_assetbase.copy()
|
||||
|
||||
if hasattr(request.cls, 'kwargs_create_item'):
|
||||
del request.cls.kwargs_create_item
|
||||
|
@ -56,7 +56,7 @@ class AssetBaseAPITestCases(
|
||||
'serial_number': '65756756756',
|
||||
}
|
||||
|
||||
url_ns_name = 'accounting:_api_v2_asset'
|
||||
url_ns_name = 'accounting:_api_asset'
|
||||
"""Url namespace (optional, if not required) and url name"""
|
||||
|
||||
|
||||
@ -69,7 +69,7 @@ class AssetBaseAPIInheritedCases(
|
||||
|
||||
model = None
|
||||
|
||||
url_ns_name = 'accounting:_api_v2_asset_sub'
|
||||
url_ns_name = 'accounting:_api_asset_sub'
|
||||
|
||||
|
||||
|
||||
|
@ -88,7 +88,7 @@ class AssetBaseViewsetInheritedCases(
|
||||
model: str = None
|
||||
"""name of the model to test"""
|
||||
|
||||
route_name = 'v2:accounting:_api_v2_asset_sub'
|
||||
route_name = 'v2:accounting:_api_asset_sub'
|
||||
|
||||
|
||||
|
||||
@ -100,6 +100,6 @@ class AssetBaseViewsetTest(
|
||||
|
||||
kwargs = {}
|
||||
|
||||
route_name = 'v2:accounting:_api_v2_asset'
|
||||
route_name = 'v2:accounting:_api_asset'
|
||||
|
||||
viewset = NoDocsViewSet
|
||||
|
@ -42,7 +42,7 @@ asset_type_names = str(asset_type_names)[:-1]
|
||||
if not asset_type_names:
|
||||
asset_type_names = 'none'
|
||||
|
||||
router.register(f'asset/(?P<asset_model>[{asset_type_names}]+)?', asset.ViewSet, feature_flag = '2025-00004', basename='_api_v2_asset_sub')
|
||||
router.register('asset', asset.NoDocsViewSet, feature_flag = '2025-00004', basename='_api_v2_asset')
|
||||
router.register(f'asset/(?P<asset_model>[{asset_type_names}]+)?', asset.ViewSet, feature_flag = '2025-00004', basename='_api_asset_sub')
|
||||
router.register('asset', asset.NoDocsViewSet, feature_flag = '2025-00004', basename='_api_asset')
|
||||
|
||||
urlpatterns = router.urls
|
||||
|
26
app/tests/fixtures/model_assetbase.py
vendored
Normal file
26
app/tests/fixtures/model_assetbase.py
vendored
Normal file
@ -0,0 +1,26 @@
|
||||
import datetime
|
||||
import pytest
|
||||
|
||||
from accounting.models.asset_base import AssetBase
|
||||
|
||||
@pytest.fixture( scope = 'class')
|
||||
def model_assetbase():
|
||||
|
||||
yield AssetBase
|
||||
|
||||
|
||||
@pytest.fixture( scope = 'class')
|
||||
def kwargs_assetbase( kwargs_centurionmodel, model_assetbase ):
|
||||
|
||||
random_str = str(datetime.datetime.now(tz=datetime.timezone.utc))
|
||||
random_str = str(random_str).replace(
|
||||
' ', '').replace(':', '').replace('+', '').replace('.', '')
|
||||
|
||||
kwargs = {
|
||||
**kwargs_centurionmodel.copy(),
|
||||
'asset_number': 'ab_' + random_str,
|
||||
'serial_number': 'ab_' + random_str,
|
||||
# 'asset_type': (model_assetbase._meta.sub_model_type, model_assetbase._meta.verbose_name),
|
||||
}
|
||||
|
||||
yield kwargs.copy()
|
Reference in New Issue
Block a user