renamed and reordered some methods in base_test.py
This commit is contained in:
parent
dfa79360c4
commit
1e09c95520
|
@ -76,7 +76,7 @@ def setup_process_instances_for_reports(
|
|||
process_model_id = "sample"
|
||||
# bpmn_file_name = "sample.bpmn"
|
||||
bpmn_file_location = "sample"
|
||||
process_model_identifier = BaseTest().basic_test_setup(
|
||||
process_model_identifier = BaseTest().create_group_and_model_with_bpmn(
|
||||
client,
|
||||
with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
|
|
@ -34,7 +34,30 @@ from werkzeug.test import TestResponse # type: ignore
|
|||
class BaseTest:
|
||||
"""BaseTest."""
|
||||
|
||||
def basic_test_setup(
|
||||
@staticmethod
|
||||
def find_or_create_user(username: str = "test_user_1") -> UserModel:
|
||||
"""Find_or_create_user."""
|
||||
user = UserModel.query.filter_by(username=username).first()
|
||||
if isinstance(user, UserModel):
|
||||
return user
|
||||
|
||||
user = UserService.create_user("internal", username, username=username)
|
||||
if isinstance(user, UserModel):
|
||||
return user
|
||||
|
||||
raise ApiError(
|
||||
error_code="create_user_error",
|
||||
message=f"Cannot find or create user: {username}",
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def logged_in_headers(
|
||||
user: UserModel, _redirect_url: str = "http://some/frontend/url"
|
||||
) -> Dict[str, str]:
|
||||
"""Logged_in_headers."""
|
||||
return dict(Authorization="Bearer " + user.encode_auth_token())
|
||||
|
||||
def create_group_and_model_with_bpmn(
|
||||
self,
|
||||
client: FlaskClient,
|
||||
user: UserModel,
|
||||
|
@ -74,56 +97,27 @@ class BaseTest:
|
|||
|
||||
return process_model_identifier
|
||||
|
||||
@staticmethod
|
||||
def find_or_create_user(username: str = "test_user_1") -> UserModel:
|
||||
"""Find_or_create_user."""
|
||||
user = UserModel.query.filter_by(username=username).first()
|
||||
if isinstance(user, UserModel):
|
||||
return user
|
||||
|
||||
user = UserService.create_user("internal", username, username=username)
|
||||
if isinstance(user, UserModel):
|
||||
return user
|
||||
|
||||
raise ApiError(
|
||||
error_code="create_user_error",
|
||||
message=f"Cannot find or create user: {username}",
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def get_open_id_constants(app: Flask) -> tuple:
|
||||
"""Get_open_id_constants."""
|
||||
open_id_server_url = app.config["OPEN_ID_SERVER_URL"]
|
||||
open_id_client_id = app.config["OPEN_ID_CLIENT_ID"]
|
||||
open_id_realm_name = app.config["OPEN_ID_REALM_NAME"]
|
||||
open_id_client_secret_key = app.config[
|
||||
"OPEN_ID_CLIENT_SECRET_KEY"
|
||||
] # noqa: S105
|
||||
|
||||
return (
|
||||
open_id_server_url,
|
||||
open_id_client_id,
|
||||
open_id_realm_name,
|
||||
open_id_client_secret_key,
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def create_process_instance(
|
||||
def create_process_group(
|
||||
self,
|
||||
client: FlaskClient,
|
||||
test_process_model_id: str,
|
||||
headers: Dict[str, str],
|
||||
) -> TestResponse:
|
||||
"""Create_process_instance.
|
||||
|
||||
There must be an existing process model to instantiate.
|
||||
"""
|
||||
modified_process_model_id = test_process_model_id.replace("/", ":")
|
||||
user: Any,
|
||||
process_group_id: str,
|
||||
display_name: str = "",
|
||||
) -> str:
|
||||
"""Create_process_group."""
|
||||
process_group = ProcessGroup(
|
||||
id=process_group_id, display_name=display_name, display_order=0, admin=False
|
||||
)
|
||||
response = client.post(
|
||||
f"/v1.0/process-models/{modified_process_model_id}/process-instances",
|
||||
headers=headers,
|
||||
"/v1.0/process-groups",
|
||||
headers=self.logged_in_headers(user),
|
||||
content_type="application/json",
|
||||
data=json.dumps(ProcessGroupSchema().dump(process_group)),
|
||||
)
|
||||
assert response.status_code == 201
|
||||
return response
|
||||
assert response.json is not None
|
||||
assert response.json["id"] == process_group_id
|
||||
return process_group_id
|
||||
|
||||
def create_process_model_with_api(
|
||||
self,
|
||||
|
@ -177,6 +171,22 @@ class BaseTest:
|
|||
"You must include the process_model_id, which must be a path to the model"
|
||||
)
|
||||
|
||||
def get_test_data_file_contents(
|
||||
self, file_name: str, process_model_test_data_dir: str
|
||||
) -> bytes:
|
||||
"""Get_test_data_file_contents."""
|
||||
file_full_path = os.path.join(
|
||||
current_app.instance_path,
|
||||
"..",
|
||||
"..",
|
||||
"tests",
|
||||
"data",
|
||||
process_model_test_data_dir,
|
||||
file_name,
|
||||
)
|
||||
with open(file_full_path, "rb") as file:
|
||||
return file.read()
|
||||
|
||||
def create_spec_file(
|
||||
self,
|
||||
client: FlaskClient,
|
||||
|
@ -229,27 +239,23 @@ class BaseTest:
|
|||
assert file["file_contents"] == file2["file_contents"]
|
||||
return file
|
||||
|
||||
def create_process_group(
|
||||
self,
|
||||
@staticmethod
|
||||
def create_process_instance_from_process_model_id(
|
||||
client: FlaskClient,
|
||||
user: Any,
|
||||
process_group_id: str,
|
||||
display_name: str = "",
|
||||
) -> str:
|
||||
"""Create_process_group."""
|
||||
process_group = ProcessGroup(
|
||||
id=process_group_id, display_name=display_name, display_order=0, admin=False
|
||||
)
|
||||
test_process_model_id: str,
|
||||
headers: Dict[str, str],
|
||||
) -> TestResponse:
|
||||
"""Create_process_instance.
|
||||
|
||||
There must be an existing process model to instantiate.
|
||||
"""
|
||||
modified_process_model_id = test_process_model_id.replace("/", ":")
|
||||
response = client.post(
|
||||
"/v1.0/process-groups",
|
||||
headers=self.logged_in_headers(user),
|
||||
content_type="application/json",
|
||||
data=json.dumps(ProcessGroupSchema().dump(process_group)),
|
||||
f"/v1.0/process-models/{modified_process_model_id}/process-instances",
|
||||
headers=headers,
|
||||
)
|
||||
assert response.status_code == 201
|
||||
assert response.json is not None
|
||||
assert response.json["id"] == process_group_id
|
||||
return process_group_id
|
||||
return response
|
||||
|
||||
# @staticmethod
|
||||
# def get_public_access_token(username: str, password: str) -> dict:
|
||||
|
@ -323,13 +329,6 @@ class BaseTest:
|
|||
)
|
||||
return user
|
||||
|
||||
@staticmethod
|
||||
def logged_in_headers(
|
||||
user: UserModel, _redirect_url: str = "http://some/frontend/url"
|
||||
) -> Dict[str, str]:
|
||||
"""Logged_in_headers."""
|
||||
return dict(Authorization="Bearer " + user.encode_auth_token())
|
||||
|
||||
def get_test_data_file_contents(
|
||||
self, file_name: str, process_model_test_data_dir: str
|
||||
) -> bytes:
|
||||
|
|
|
@ -44,7 +44,7 @@ class TestLoggingService(BaseTest):
|
|||
user=with_super_admin_user,
|
||||
)
|
||||
headers = self.logged_in_headers(with_super_admin_user)
|
||||
response = self.create_process_instance(
|
||||
response = self.create_process_instance_from_process_model_id(
|
||||
client, process_model_identifier, headers
|
||||
)
|
||||
assert response.json is not None
|
||||
|
|
|
@ -29,7 +29,7 @@ class TestNestedGroups(BaseTest):
|
|||
process_model_id = "manual_task"
|
||||
bpmn_file_name = "manual_task.bpmn"
|
||||
bpmn_file_location = "manual_task"
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client,
|
||||
with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
@ -37,7 +37,7 @@ class TestNestedGroups(BaseTest):
|
|||
bpmn_file_name=bpmn_file_name,
|
||||
bpmn_file_location=bpmn_file_location,
|
||||
)
|
||||
response = self.create_process_instance(
|
||||
response = self.create_process_instance_from_process_model_id(
|
||||
client,
|
||||
process_model_identifier,
|
||||
self.logged_in_headers(with_super_admin_user),
|
||||
|
@ -90,7 +90,7 @@ class TestNestedGroups(BaseTest):
|
|||
process_model_id = "manual_task"
|
||||
bpmn_file_name = "manual_task.bpmn"
|
||||
bpmn_file_location = "manual_task"
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client,
|
||||
with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
@ -98,7 +98,7 @@ class TestNestedGroups(BaseTest):
|
|||
bpmn_file_name=bpmn_file_name,
|
||||
bpmn_file_location=bpmn_file_location,
|
||||
)
|
||||
response = self.create_process_instance(
|
||||
response = self.create_process_instance_from_process_model_id(
|
||||
client,
|
||||
process_model_identifier,
|
||||
self.logged_in_headers(with_super_admin_user),
|
||||
|
|
|
@ -285,7 +285,7 @@ class TestProcessApi(BaseTest):
|
|||
)
|
||||
headers = self.logged_in_headers(with_super_admin_user)
|
||||
# create an instance from a model
|
||||
response = self.create_process_instance(
|
||||
response = self.create_process_instance_from_process_model_id(
|
||||
client, process_model_identifier, headers
|
||||
)
|
||||
|
||||
|
@ -622,7 +622,7 @@ class TestProcessApi(BaseTest):
|
|||
with_super_admin_user: UserModel,
|
||||
) -> None:
|
||||
"""Test_process_model_file_update."""
|
||||
process_model_identifier = self.basic_test_setup(client, with_super_admin_user)
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(client, with_super_admin_user)
|
||||
modified_process_model_id = process_model_identifier.replace("/", ":")
|
||||
|
||||
data = {"key1": "THIS DATA"}
|
||||
|
@ -646,7 +646,7 @@ class TestProcessApi(BaseTest):
|
|||
with_super_admin_user: UserModel,
|
||||
) -> None:
|
||||
"""Test_process_model_file_update."""
|
||||
process_model_identifier = self.basic_test_setup(client, with_super_admin_user)
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(client, with_super_admin_user)
|
||||
modified_process_model_id = process_model_identifier.replace("/", ":")
|
||||
|
||||
data = {"file": (io.BytesIO(b""), "random_fact.svg")}
|
||||
|
@ -722,7 +722,7 @@ class TestProcessApi(BaseTest):
|
|||
with_super_admin_user: UserModel,
|
||||
) -> None:
|
||||
"""Test_process_model_file_update."""
|
||||
process_model_identifier = self.basic_test_setup(client, with_super_admin_user)
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(client, with_super_admin_user)
|
||||
# self.create_spec_file(client, user=with_super_admin_user)
|
||||
|
||||
# process_model = load_test_spec("random_fact")
|
||||
|
@ -748,7 +748,7 @@ class TestProcessApi(BaseTest):
|
|||
with_super_admin_user: UserModel,
|
||||
) -> None:
|
||||
"""Test_process_model_file_update."""
|
||||
process_model_identifier = self.basic_test_setup(client, with_super_admin_user)
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(client, with_super_admin_user)
|
||||
modified_process_model_identifier = process_model_identifier.replace("/", ":")
|
||||
|
||||
response = client.delete(
|
||||
|
@ -769,7 +769,7 @@ class TestProcessApi(BaseTest):
|
|||
with_super_admin_user: UserModel,
|
||||
) -> None:
|
||||
"""Test_process_model_file_update."""
|
||||
process_model_identifier = self.basic_test_setup(client, with_super_admin_user)
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(client, with_super_admin_user)
|
||||
modified_process_model_identifier = process_model_identifier.replace("/", ":")
|
||||
|
||||
response = client.delete(
|
||||
|
@ -796,7 +796,7 @@ class TestProcessApi(BaseTest):
|
|||
with_super_admin_user: UserModel,
|
||||
) -> None:
|
||||
"""Test_get_file."""
|
||||
process_model_identifier = self.basic_test_setup(client, with_super_admin_user)
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(client, with_super_admin_user)
|
||||
modified_process_model_identifier = process_model_identifier.replace("/", ":")
|
||||
|
||||
response = client.get(
|
||||
|
@ -816,7 +816,7 @@ class TestProcessApi(BaseTest):
|
|||
with_super_admin_user: UserModel,
|
||||
) -> None:
|
||||
"""Test_get_workflow_from_workflow_spec."""
|
||||
process_model_identifier = self.basic_test_setup(client, with_super_admin_user)
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(client, with_super_admin_user)
|
||||
modified_process_model_identifier = process_model_identifier.replace("/", ":")
|
||||
|
||||
response = client.post(
|
||||
|
@ -851,7 +851,7 @@ class TestProcessApi(BaseTest):
|
|||
with_super_admin_user: UserModel,
|
||||
) -> None:
|
||||
"""Test_get_process_groups_when_there_are_some."""
|
||||
self.basic_test_setup(client, with_super_admin_user)
|
||||
self.create_group_and_model_with_bpmn(client, with_super_admin_user)
|
||||
response = client.get(
|
||||
"/v1.0/process-groups",
|
||||
headers=self.logged_in_headers(with_super_admin_user),
|
||||
|
@ -871,7 +871,7 @@ class TestProcessApi(BaseTest):
|
|||
with_super_admin_user: UserModel,
|
||||
) -> None:
|
||||
"""Test_get_process_group_when_found."""
|
||||
process_model_identifier = self.basic_test_setup(client, with_super_admin_user)
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(client, with_super_admin_user)
|
||||
process_group_id, process_model_id = os.path.split(process_model_identifier)
|
||||
|
||||
response = client.get(
|
||||
|
@ -892,7 +892,7 @@ class TestProcessApi(BaseTest):
|
|||
with_super_admin_user: UserModel,
|
||||
) -> None:
|
||||
"""Test_get_process_model_when_found."""
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client, with_super_admin_user, bpmn_file_name="random_fact.bpmn"
|
||||
)
|
||||
modified_process_model_identifier = process_model_identifier.replace("/", ":")
|
||||
|
@ -937,7 +937,7 @@ class TestProcessApi(BaseTest):
|
|||
"""Test_process_instance_create."""
|
||||
test_process_model_id = "runs_without_input/sample"
|
||||
headers = self.logged_in_headers(with_super_admin_user)
|
||||
response = self.create_process_instance(client, test_process_model_id, headers)
|
||||
response = self.create_process_instance_from_process_model_id(client, test_process_model_id, headers)
|
||||
assert response.json is not None
|
||||
assert response.json["updated_at_in_seconds"] is not None
|
||||
assert response.json["status"] == "not_started"
|
||||
|
@ -955,7 +955,7 @@ class TestProcessApi(BaseTest):
|
|||
) -> None:
|
||||
"""Test_process_instance_run."""
|
||||
# process_model_id = "runs_without_input/sample"
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client=client,
|
||||
user=with_super_admin_user,
|
||||
process_group_id="runs_without_input",
|
||||
|
@ -965,7 +965,7 @@ class TestProcessApi(BaseTest):
|
|||
)
|
||||
|
||||
headers = self.logged_in_headers(with_super_admin_user)
|
||||
response = self.create_process_instance(
|
||||
response = self.create_process_instance_from_process_model_id(
|
||||
client, process_model_identifier, headers
|
||||
)
|
||||
assert response.json is not None
|
||||
|
@ -997,7 +997,7 @@ class TestProcessApi(BaseTest):
|
|||
"""Test_process_instance_show."""
|
||||
process_group_id = "simple_script"
|
||||
process_model_id = "simple_script"
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client,
|
||||
with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
@ -1005,7 +1005,7 @@ class TestProcessApi(BaseTest):
|
|||
)
|
||||
modified_process_model_identifier = process_model_identifier.replace("/", ":")
|
||||
headers = self.logged_in_headers(with_super_admin_user)
|
||||
create_response = self.create_process_instance(
|
||||
create_response = self.create_process_instance_from_process_model_id(
|
||||
client, process_model_identifier, headers
|
||||
)
|
||||
assert create_response.json is not None
|
||||
|
@ -1040,7 +1040,7 @@ class TestProcessApi(BaseTest):
|
|||
process_model_id = "message_receiver"
|
||||
bpmn_file_name = "message_receiver.bpmn"
|
||||
bpmn_file_location = "message_send_one_conversation"
|
||||
self.basic_test_setup(
|
||||
self.create_group_and_model_with_bpmn(
|
||||
client,
|
||||
with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
@ -1088,7 +1088,7 @@ class TestProcessApi(BaseTest):
|
|||
process_model_id = "message_sender"
|
||||
bpmn_file_name = "message_sender.bpmn"
|
||||
bpmn_file_location = "message_send_one_conversation"
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client,
|
||||
with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
@ -1105,7 +1105,7 @@ class TestProcessApi(BaseTest):
|
|||
"andThis": "another_item_non_key",
|
||||
}
|
||||
}
|
||||
response = self.create_process_instance(
|
||||
response = self.create_process_instance_from_process_model_id(
|
||||
client,
|
||||
process_model_identifier,
|
||||
self.logged_in_headers(with_super_admin_user),
|
||||
|
@ -1156,7 +1156,7 @@ class TestProcessApi(BaseTest):
|
|||
process_model_id = "message_sender"
|
||||
bpmn_file_name = "message_sender.bpmn"
|
||||
bpmn_file_location = "message_send_one_conversation"
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client,
|
||||
with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
@ -1165,7 +1165,7 @@ class TestProcessApi(BaseTest):
|
|||
bpmn_file_location=bpmn_file_location,
|
||||
)
|
||||
|
||||
response = self.create_process_instance(
|
||||
response = self.create_process_instance_from_process_model_id(
|
||||
client,
|
||||
process_model_identifier,
|
||||
self.logged_in_headers(with_super_admin_user),
|
||||
|
@ -1205,7 +1205,7 @@ class TestProcessApi(BaseTest):
|
|||
process_model_id = "user_task"
|
||||
bpmn_file_name = "user_task.bpmn"
|
||||
bpmn_file_location = "user_task"
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client,
|
||||
with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
@ -1215,7 +1215,7 @@ class TestProcessApi(BaseTest):
|
|||
)
|
||||
|
||||
headers = self.logged_in_headers(with_super_admin_user)
|
||||
response = self.create_process_instance(
|
||||
response = self.create_process_instance_from_process_model_id(
|
||||
client, process_model_identifier, headers
|
||||
)
|
||||
assert response.json is not None
|
||||
|
@ -1244,7 +1244,7 @@ class TestProcessApi(BaseTest):
|
|||
process_group_id = "my_process_group"
|
||||
process_model_id = "dynamic_enum_select_fields"
|
||||
bpmn_file_location = "dynamic_enum_select_fields"
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client,
|
||||
with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
@ -1254,7 +1254,7 @@ class TestProcessApi(BaseTest):
|
|||
)
|
||||
|
||||
headers = self.logged_in_headers(with_super_admin_user)
|
||||
response = self.create_process_instance(
|
||||
response = self.create_process_instance_from_process_model_id(
|
||||
client, process_model_identifier, headers
|
||||
)
|
||||
assert response.json is not None
|
||||
|
@ -1296,7 +1296,7 @@ class TestProcessApi(BaseTest):
|
|||
process_group_id = "runs_without_input"
|
||||
process_model_id = "sample"
|
||||
bpmn_file_location = "sample"
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client,
|
||||
with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
@ -1305,7 +1305,7 @@ class TestProcessApi(BaseTest):
|
|||
)
|
||||
|
||||
headers = self.logged_in_headers(with_super_admin_user)
|
||||
self.create_process_instance(client, process_model_identifier, headers)
|
||||
self.create_process_instance_from_process_model_id(client, process_model_identifier, headers)
|
||||
|
||||
response = client.get(
|
||||
"/v1.0/process-instances",
|
||||
|
@ -1341,7 +1341,7 @@ class TestProcessApi(BaseTest):
|
|||
process_model_id = "sample"
|
||||
bpmn_file_name = "sample.bpmn"
|
||||
bpmn_file_location = "sample"
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client,
|
||||
with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
@ -1350,11 +1350,11 @@ class TestProcessApi(BaseTest):
|
|||
bpmn_file_location=bpmn_file_location,
|
||||
)
|
||||
headers = self.logged_in_headers(with_super_admin_user)
|
||||
self.create_process_instance(client, process_model_identifier, headers)
|
||||
self.create_process_instance(client, process_model_identifier, headers)
|
||||
self.create_process_instance(client, process_model_identifier, headers)
|
||||
self.create_process_instance(client, process_model_identifier, headers)
|
||||
self.create_process_instance(client, process_model_identifier, headers)
|
||||
self.create_process_instance_from_process_model_id(client, process_model_identifier, headers)
|
||||
self.create_process_instance_from_process_model_id(client, process_model_identifier, headers)
|
||||
self.create_process_instance_from_process_model_id(client, process_model_identifier, headers)
|
||||
self.create_process_instance_from_process_model_id(client, process_model_identifier, headers)
|
||||
self.create_process_instance_from_process_model_id(client, process_model_identifier, headers)
|
||||
|
||||
response = client.get(
|
||||
"/v1.0/process-instances?per_page=2&page=3",
|
||||
|
@ -1390,7 +1390,7 @@ class TestProcessApi(BaseTest):
|
|||
process_model_id = "sample"
|
||||
bpmn_file_name = "sample.bpmn"
|
||||
bpmn_file_location = "sample"
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client,
|
||||
with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
@ -1503,7 +1503,7 @@ class TestProcessApi(BaseTest):
|
|||
process_model_id = "sample"
|
||||
bpmn_file_name = "sample.bpmn"
|
||||
bpmn_file_location = "sample"
|
||||
process_model_identifier = self.basic_test_setup( # noqa: F841
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn( # noqa: F841
|
||||
client,
|
||||
with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
@ -1543,7 +1543,7 @@ class TestProcessApi(BaseTest):
|
|||
process_model_id = "sample"
|
||||
# bpmn_file_name = "sample.bpmn"
|
||||
# bpmn_file_location = "sample"
|
||||
# process_model_identifier = self.basic_test_setup(
|
||||
# process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
# client,
|
||||
# with_super_admin_user,
|
||||
# process_group_id=process_group_id,
|
||||
|
@ -1657,7 +1657,7 @@ class TestProcessApi(BaseTest):
|
|||
) -> Any:
|
||||
"""Setup_testing_instance."""
|
||||
headers = self.logged_in_headers(with_super_admin_user)
|
||||
response = self.create_process_instance(client, process_model_id, headers)
|
||||
response = self.create_process_instance_from_process_model_id(client, process_model_id, headers)
|
||||
process_instance = response.json
|
||||
assert isinstance(process_instance, dict)
|
||||
process_instance_id = process_instance["id"]
|
||||
|
@ -1675,7 +1675,7 @@ class TestProcessApi(BaseTest):
|
|||
process_model_id = "error"
|
||||
bpmn_file_name = "error.bpmn"
|
||||
bpmn_file_location = "error"
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client,
|
||||
with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
@ -1729,7 +1729,7 @@ class TestProcessApi(BaseTest):
|
|||
process_model_id = "error"
|
||||
bpmn_file_name = "error.bpmn"
|
||||
bpmn_file_location = "error"
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client,
|
||||
with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
@ -1783,7 +1783,7 @@ class TestProcessApi(BaseTest):
|
|||
process_model_id = "error"
|
||||
bpmn_file_name = "error.bpmn"
|
||||
bpmn_file_location = "error"
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client,
|
||||
with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
@ -1842,7 +1842,7 @@ class TestProcessApi(BaseTest):
|
|||
file_data = b"abc123"
|
||||
bpmn_file_name = "hello_world.bpmn"
|
||||
bpmn_file_location = "hello_world"
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client,
|
||||
with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
@ -1875,7 +1875,7 @@ class TestProcessApi(BaseTest):
|
|||
process_model_id = "message_receiver"
|
||||
bpmn_file_name = "message_receiver.bpmn"
|
||||
bpmn_file_location = "message_send_one_conversation"
|
||||
self.basic_test_setup(
|
||||
self.create_group_and_model_with_bpmn(
|
||||
client,
|
||||
with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
@ -1967,7 +1967,7 @@ class TestProcessApi(BaseTest):
|
|||
process_model_id = "model_with_lanes"
|
||||
bpmn_file_name = "lanes.bpmn"
|
||||
bpmn_file_location = "model_with_lanes"
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client,
|
||||
with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
@ -1982,7 +1982,7 @@ class TestProcessApi(BaseTest):
|
|||
# process_group_id="finance",
|
||||
# )
|
||||
|
||||
response = self.create_process_instance(
|
||||
response = self.create_process_instance_from_process_model_id(
|
||||
client,
|
||||
# process_model.process_group_id,
|
||||
process_model_identifier,
|
||||
|
@ -2170,7 +2170,7 @@ class TestProcessApi(BaseTest):
|
|||
"""Test_process_instance_suspend."""
|
||||
bpmn_file_name = "manual_task.bpmn"
|
||||
bpmn_file_location = "manual_task"
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client=client,
|
||||
user=with_super_admin_user,
|
||||
process_model_id="manual_task",
|
||||
|
@ -2191,7 +2191,7 @@ class TestProcessApi(BaseTest):
|
|||
)
|
||||
|
||||
headers = self.logged_in_headers(with_super_admin_user)
|
||||
response = self.create_process_instance(
|
||||
response = self.create_process_instance_from_process_model_id(
|
||||
client, process_model_identifier, headers
|
||||
)
|
||||
assert response.json is not None
|
||||
|
@ -2238,7 +2238,7 @@ class TestProcessApi(BaseTest):
|
|||
process_model_id = "simple_script"
|
||||
bpmn_file_name = "simple_script.bpmn"
|
||||
bpmn_file_location = "simple_script"
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client=client,
|
||||
user=with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
|
|
@ -103,7 +103,7 @@ class TestAuthorizationService(BaseTest):
|
|||
self.find_or_create_user("testuser1")
|
||||
AuthorizationService.import_permissions_from_yaml_file()
|
||||
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client=client,
|
||||
user=with_super_admin_user,
|
||||
process_group_id="test_group",
|
||||
|
|
|
@ -26,7 +26,7 @@ class TestDotNotation(BaseTest):
|
|||
process_model_id = "test_dot_notation"
|
||||
bpmn_file_name = "diagram.bpmn"
|
||||
bpmn_file_location = "dot_notation"
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client,
|
||||
with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
@ -36,7 +36,7 @@ class TestDotNotation(BaseTest):
|
|||
)
|
||||
|
||||
headers = self.logged_in_headers(with_super_admin_user)
|
||||
response = self.create_process_instance(
|
||||
response = self.create_process_instance_from_process_model_id(
|
||||
client, process_model_identifier, headers
|
||||
)
|
||||
process_instance_id = response.json["id"]
|
||||
|
|
|
@ -19,7 +19,7 @@ class TestMessageInstance(BaseTest):
|
|||
process_model_id = "hello_world"
|
||||
bpmn_file_name = "hello_world.bpmn"
|
||||
bpmn_file_location = "hello_world"
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client,
|
||||
user,
|
||||
process_group_id=process_group_id,
|
||||
|
|
|
@ -34,7 +34,7 @@ class TestSpecFileService(BaseTest):
|
|||
with_super_admin_user: UserModel,
|
||||
) -> None:
|
||||
"""Test_can_store_process_ids_for_lookup."""
|
||||
self.basic_test_setup(
|
||||
self.create_group_and_model_with_bpmn(
|
||||
client=client,
|
||||
user=with_super_admin_user,
|
||||
process_group_id=self.process_group_id,
|
||||
|
@ -59,7 +59,7 @@ class TestSpecFileService(BaseTest):
|
|||
) -> None:
|
||||
"""Test_fails_to_save_duplicate_process_id."""
|
||||
bpmn_process_identifier = "Level1"
|
||||
self.basic_test_setup(
|
||||
self.create_group_and_model_with_bpmn(
|
||||
client=client,
|
||||
user=with_super_admin_user,
|
||||
process_group_id=self.process_group_id,
|
||||
|
@ -103,7 +103,7 @@ class TestSpecFileService(BaseTest):
|
|||
db.session.add(process_id_lookup)
|
||||
db.session.commit()
|
||||
|
||||
self.basic_test_setup(
|
||||
self.create_group_and_model_with_bpmn(
|
||||
client=client,
|
||||
user=with_super_admin_user,
|
||||
process_group_id=self.process_group_id,
|
||||
|
@ -143,7 +143,7 @@ class TestSpecFileService(BaseTest):
|
|||
"""
|
||||
process_group_id = "test_group"
|
||||
process_model_id = "call_activity_nested"
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client=client,
|
||||
user=with_super_admin_user,
|
||||
process_group_id=process_group_id,
|
||||
|
|
|
@ -20,7 +20,7 @@ class TestVariousBpmnConstructs(BaseTest):
|
|||
with_super_admin_user: UserModel,
|
||||
) -> None:
|
||||
"""Test_running_process_with_timer_intermediate_catch_event."""
|
||||
process_model_identifier = self.basic_test_setup(
|
||||
process_model_identifier = self.create_group_and_model_with_bpmn(
|
||||
client,
|
||||
with_super_admin_user,
|
||||
"test_group",
|
||||
|
|
Loading…
Reference in New Issue