From 3155decffe01cf44c42ad74e14ca0f8ca4b1326b Mon Sep 17 00:00:00 2001 From: Joel Davies Date: Mon, 24 Jun 2024 11:58:42 +0000 Subject: [PATCH] Fix test interference and remove unnecessary mock data #302 --- test/e2e/mock_schemas.py | 15 --------------- test/e2e/test_system.py | 16 ++++++++++++---- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/test/e2e/mock_schemas.py b/test/e2e/mock_schemas.py index 6a9a0264..65b700d9 100644 --- a/test/e2e/mock_schemas.py +++ b/test/e2e/mock_schemas.py @@ -118,21 +118,6 @@ "id": ANY, "code": "system-b", } - -SYSTEM_POST_C = { - "name": "System C", - "description": "System description", - "location": "Test location", - "owner": "Me", - "importance": "low", -} -SYSTEM_POST_C_EXPECTED = { - **SYSTEM_POST_C, - **CREATED_MODIFIED_VALUES_EXPECTED, - "id": ANY, - "parent_id": None, - "code": "system-c", -} # pylint: enable=duplicate-code USAGE_STATUS_POST_A = {"value": "New"} diff --git a/test/e2e/test_system.py b/test/e2e/test_system.py index 6edcd88c..9cc3cdad 100644 --- a/test/e2e/test_system.py +++ b/test/e2e/test_system.py @@ -165,7 +165,13 @@ class GetBreadcrumbsDSL(CreateDSL): """Base class for breadcrumbs tests""" _get_response: Response - _posted_systems_get_data = [] + _posted_systems_get_data: list[dict] + + @pytest.fixture(autouse=True) + def setup_breadcrumbs_dsl(self): + """Setup fixtures""" + + self._posted_systems_get_data = [] def post_nested_systems(self, number: int) -> list[str]: """Posts the given number of nested systems where each successive one has the previous as its parent""" @@ -344,7 +350,6 @@ def test_list_with_invalid_parent_id_filter(self): self.check_list_success([]) -# TODO: Put nested system stuff in create rather than get then change this to that class UpdateDSL(GetBreadcrumbsDSL): """Base class for update tests""" @@ -456,7 +461,7 @@ def test_partial_update_invalid_id(self): self.check_patch_system_failed_with_message(404, "System not found") -class DeleteDSL(CreateDSL): +class DeleteDSL(GetDSL): """Base class for delete tests""" _delete_response: Response @@ -489,6 +494,9 @@ def test_delete(self): self.delete_system(system_id) self.check_delete_success() + self.get_system(system_id) + self.check_get_failed_with_message(404, "System not found") + def test_delete_with_child_system(self): """Test deleting a System with a child system""" @@ -500,7 +508,7 @@ def test_delete_with_child_system(self): def test_delete_with_child_item(self): """Test deleting a System with a child system""" - # TODO: Cleanup in future + # THIS SHOULD BE CLEANED UP IN FUTURE system_id = self.post_system(SYSTEM_POST_DATA_REQUIRED_VALUES_ONLY) self.post_system({**SYSTEM_POST_DATA_REQUIRED_VALUES_ONLY, "parent_id": system_id})