mypy

src/spiffworkflow_backend/services/acceptance_test_fixtures.py

@@ -4,16 +4,15 @@ import time
 
 from flask_bpmn.models.db import db
 
-from spiffworkflow_backend.helpers.fixture_data import find_or_create_user
 from spiffworkflow_backend.models.process_instance import ProcessInstanceModel
 from spiffworkflow_backend.models.process_instance import ProcessInstanceStatus
-
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
 
 def load_fixtures() -> list[ProcessInstanceModel]:
     """Load_fixtures."""
     test_process_group_id = "acceptance-tests-group-one"
     test_process_model_id = "acceptance-tests-model-1"
-    user = find_or_create_user()
+    user = BaseTest.find_or_create_user()
     statuses = ProcessInstanceStatus.list()
     current_time = round(time.time())
 

tests/spiffworkflow_backend/helpers/base_test.py

@@ -1,5 +1,6 @@
 """Base_test."""
 from flask.app import Flask
+from flask_bpmn.api.api_error import ApiError
 
 from spiffworkflow_backend.models.user import UserModel
 from spiffworkflow_backend.services.authentication_service import (
@@ -7,6 +8,8 @@ from spiffworkflow_backend.services.authentication_service import (
 )
 from spiffworkflow_backend.services.user_service import UserService
 
+from typing import Optional
+
 
 class BaseTest:
     """BaseTest."""
@@ -18,14 +21,16 @@ class BaseTest:
         if isinstance(user, UserModel):
             return user
 
-        else:
-            user: UserModel = UserService().create_user(
-                "local", username, username=username
-            )
+        user = UserService().create_user(
+            "local", username, username=username
+        )
+        if isinstance(user, UserModel):
             UserService().create_principal(user_id=user.id)
-
             return user
 
+        raise ApiError(code="create_user_error",
+                       message=f"Cannot find or create user: {username}")
+
     @staticmethod
     def get_keycloak_constants(app: Flask) -> tuple:
         """Get_keycloak_constants."""

tests/spiffworkflow_backend/unit/test_permissions.py

@@ -1,7 +1,7 @@
 """Test Permissions."""
 from flask.app import Flask
 
-from spiffworkflow_backend.helpers.fixture_data import find_or_create_user
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
 
 # from tests.spiffworkflow_backend.helpers.test_data import find_or_create_process_group
 # from spiffworkflow_backend.models.permission_assignment import PermissionAssignmentModel
@@ -10,7 +10,7 @@ from spiffworkflow_backend.helpers.fixture_data import find_or_create_user
 
 def test_user_can_be_given_permission_to_administer_process_group(app: Flask) -> None:
     """Test_user_can_be_given_permission_to_administer_process_group."""
-    find_or_create_user()
+    BaseTest.find_or_create_user()
 
     # process_group = find_or_create_process_group()
     # permission_target = PermissionTargetModel(process_group_id=process_group.id)

tests/spiffworkflow_backend/unit/test_process_instance_report.py

@@ -3,7 +3,6 @@ from typing import Optional
 
 from flask.app import Flask
 
-from spiffworkflow_backend.helpers.fixture_data import find_or_create_user
 from spiffworkflow_backend.models.process_instance import ProcessInstanceModel
 from spiffworkflow_backend.models.process_instance_report import (
     ProcessInstanceReportModel,
@@ -12,6 +11,7 @@ from spiffworkflow_backend.models.process_instance_report import (
 # from tests.spiffworkflow_backend.helpers.test_data import find_or_create_process_group
 # from spiffworkflow_backend.models.permission_assignment import PermissionAssignmentModel
 # from spiffworkflow_backend.models.permission_target import PermissionTargetModel
+from tests.spiffworkflow_backend.helpers.base_test import BaseTest
 
 
 def test_generate_report_with_filter_by(
@@ -131,7 +131,7 @@ def do_report_with_metadata_and_instances(
         process_group_identifier=process_instances[0].process_group_identifier,
         process_model_identifier=process_instances[0].process_model_identifier,
         report_metadata=report_metadata,
-        user=find_or_create_user(),
+        user=BaseTest.find_or_create_user(),
     )
 
     return process_instance_report.generate_report(