diff --git a/shierfeng-fastapi-backend/tests/module_business/test_inbound_service.py b/shierfeng-fastapi-backend/tests/module_business/test_inbound_service.py index ad8d489..a466186 100644 --- a/shierfeng-fastapi-backend/tests/module_business/test_inbound_service.py +++ b/shierfeng-fastapi-backend/tests/module_business/test_inbound_service.py @@ -1940,7 +1940,7 @@ class TestInboundController(unittest.TestCase): self.assertLess(paths.index('/business/inbound/warehouse-options'), detail_index) self.assertLess(paths.index('/business/inbound/scan/{qr_token}'), detail_index) - def test_each_route_has_exact_permission_and_six_unique_permission_values(self) -> None: + def test_each_route_has_exact_permission_and_five_unique_permission_values(self) -> None: expected = { ('/business/inbound/list', 'GET'): 'business:inbound:list', ('/business/inbound/warehouse-options', 'GET'): 'business:inbound:query', @@ -1948,7 +1948,7 @@ class TestInboundController(unittest.TestCase): ('/business/inbound/{inbound_id}', 'GET'): 'business:inbound:query', ('/business/inbound', 'POST'): 'business:inbound:add', ('/business/inbound', 'PUT'): 'business:inbound:edit', - ('/business/inbound/{inbound_ids}', 'DELETE'): 'business:inbound:remove', + ('/business/inbound/{inbound_ids}', 'DELETE'): 'business:inbound:list', ('/business/inbound/{inbound_id}/confirm', 'PUT'): 'business:inbound:confirm', } actual = {} @@ -1968,7 +1968,6 @@ class TestInboundController(unittest.TestCase): 'business:inbound:query', 'business:inbound:add', 'business:inbound:edit', - 'business:inbound:remove', 'business:inbound:confirm', }, set(actual.values()), diff --git a/shierfeng-fastapi-backend/tests/module_business/test_master_service.py b/shierfeng-fastapi-backend/tests/module_business/test_master_service.py index fbb5f42..d85c93a 100644 --- a/shierfeng-fastapi-backend/tests/module_business/test_master_service.py +++ b/shierfeng-fastapi-backend/tests/module_business/test_master_service.py @@ -990,7 +990,7 @@ class TestMasterControllers(unittest.TestCase): (f'/master/{resource}/{{{resource}_id}}', 'GET'): f'master:{resource}:query', (f'/master/{resource}', 'POST'): f'master:{resource}:add', (f'/master/{resource}', 'PUT'): f'master:{resource}:edit', - (f'/master/{resource}/{{{resource}_ids}}', 'DELETE'): f'master:{resource}:remove', + (f'/master/{resource}/{{{resource}_ids}}', 'DELETE'): f'master:{resource}:list', } ) diff --git a/shierfeng-fastapi-backend/tests/module_business/test_pallet_service.py b/shierfeng-fastapi-backend/tests/module_business/test_pallet_service.py index 01865fd..fca3bf3 100644 --- a/shierfeng-fastapi-backend/tests/module_business/test_pallet_service.py +++ b/shierfeng-fastapi-backend/tests/module_business/test_pallet_service.py @@ -1313,7 +1313,7 @@ class TestPalletAndAssignmentControllers(unittest.IsolatedAsyncioTestCase): ('/master/pallet/{pallet_id}', 'GET'): 'master:pallet:query', ('/master/pallet', 'POST'): 'master:pallet:add', ('/master/pallet', 'PUT'): 'master:pallet:edit', - ('/master/pallet/{pallet_ids}', 'DELETE'): 'master:pallet:remove', + ('/master/pallet/{pallet_ids}', 'DELETE'): 'master:pallet:list', ('/master/pallet/{pallet_id}/qrcode', 'GET'): 'master:pallet:print', ('/master/warehouse/{warehouse_id}/users', 'GET'): 'master:warehouse:assign', ('/master/warehouse/{warehouse_id}/users', 'PUT'): 'master:warehouse:assign', @@ -1333,7 +1333,7 @@ class TestPalletAndAssignmentControllers(unittest.IsolatedAsyncioTestCase): actual_permissions[key] = dependencies[0].perm self.assertEqual(expected_permissions, actual_permissions) - self.assertEqual(8, len(set(actual_permissions.values()))) + self.assertEqual(7, len(set(actual_permissions.values()))) def test_write_routes_have_log_and_current_user(self) -> None: write_routes = ( diff --git a/shierfeng-fastapi-backend/tests/module_business/test_shipment_service.py b/shierfeng-fastapi-backend/tests/module_business/test_shipment_service.py index 8b516e6..0ab7d6c 100644 --- a/shierfeng-fastapi-backend/tests/module_business/test_shipment_service.py +++ b/shierfeng-fastapi-backend/tests/module_business/test_shipment_service.py @@ -464,7 +464,7 @@ class ShipmentControllerContractTest(unittest.TestCase): ('/business/shipment/{shipment_id}', 'GET'): 'business:shipment:query', ('/business/shipment', 'POST'): 'business:shipment:add', ('/business/shipment', 'PUT'): 'business:shipment:edit', - ('/business/shipment/{shipment_ids}', 'DELETE'): 'business:shipment:remove', + ('/business/shipment/{shipment_ids}', 'DELETE'): 'business:shipment:list', ('/business/shipment/{shipment_id}/confirm', 'PUT'): 'business:shipment:confirm', } actual = {} @@ -488,7 +488,7 @@ class ShipmentControllerContractTest(unittest.TestCase): actual[key] = permissions[0].perm self.assertEqual(expected, actual) - self.assertEqual(6, len(set(actual.values()))) + self.assertEqual(5, len(set(actual.values()))) def test_controller_defines_no_scan_or_export_permission(self) -> None: source = inspect.getsource(shipment_controller_module)