sartography
/
spiff-arena
mirror of https://github.com/sartography/spiff-arena.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed broken test w/ burnettk

This commit is contained in:
jasquat 2022-12-09 15:19:43 -05:00
parent d37550fa43
commit d7221690f0
2 changed files with 88 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

173
spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_process_api.py
View File

@ -9,6 +9,7 @@ import pytest
from flask.app import Flask from flask.app import Flask
from flask.testing import FlaskClient from flask.testing import FlaskClient
from flask_bpmn.models.db import db from flask_bpmn.models.db import db
from spiffworkflow_backend.services.git_service import GitService
from tests.spiffworkflow_backend.helpers.base_test import BaseTest from tests.spiffworkflow_backend.helpers.base_test import BaseTest
from tests.spiffworkflow_backend.helpers.test_data import load_test_spec from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
@ -2564,111 +2565,111 @@ class TestProcessApi(BaseTest):
) -> None: ) -> None:
"""Test_process_model_publish.""" """Test_process_model_publish."""
bpmn_root = FileSystemService.root_path() bpmn_root = FileSystemService.root_path()
shell_command = f"git init {bpmn_root}" shell_command = ["git", "init", bpmn_root]
output = os.popen(shell_command).read() # noqa: S605 output = GitService.run_shell_command_to_get_stdout(shell_command)
assert output == f"Initialized empty Git repository in {bpmn_root}/.git/\n" assert output == f"Initialized empty Git repository in {bpmn_root}/.git/\n"
os.chdir(bpmn_root) with FileSystemService.cd(bpmn_root):
output = os.popen("git status").read() # noqa: S605 output = GitService.run_shell_command_to_get_stdout(["git", "status"])
assert "On branch main" in output assert "On branch main" in output
assert "No commits yet" in output assert "No commits yet" in output
assert ( assert (
'nothing to commit (create/copy files and use "git add" to track)' in output 'nothing to commit (create/copy files and use "git add" to track)' in output
) )
process_group_id = "test_group" process_group_id = "test_group"
self.create_process_group( self.create_process_group(
client, with_super_admin_user, process_group_id, process_group_id client, with_super_admin_user, process_group_id, process_group_id
) )
sub_process_group_id = "test_group/test_sub_group" sub_process_group_id = "test_group/test_sub_group"
process_model_id = "hello_world" process_model_id = "hello_world"
bpmn_file_name = "hello_world.bpmn" bpmn_file_name = "hello_world.bpmn"
bpmn_file_location = "hello_world" bpmn_file_location = "hello_world"
process_model_identifier = self.create_group_and_model_with_bpmn( process_model_identifier = self.create_group_and_model_with_bpmn(
client=client, client=client,
user=with_super_admin_user, user=with_super_admin_user,
process_group_id=sub_process_group_id, process_group_id=sub_process_group_id,
process_model_id=process_model_id, process_model_id=process_model_id,
bpmn_file_name=bpmn_file_name, bpmn_file_name=bpmn_file_name,
bpmn_file_location=bpmn_file_location, bpmn_file_location=bpmn_file_location,
) )
process_model_absolute_dir = os.path.join(bpmn_root, process_model_identifier) process_model_absolute_dir = os.path.join(bpmn_root, process_model_identifier)
output = os.popen("git status").read() # noqa: S605 output = GitService.run_shell_command_to_get_stdout(["git", "status"])
test_string = 'Untracked files:\n (use "git add <file>..." to include in what will be committed)\n\ttest_group' test_string = 'Untracked files:\n (use "git add <file>..." to include in what will be committed)\n\ttest_group'
assert test_string in output assert test_string in output
os.system("git add .") os.system("git add .")
output = os.popen("git commit -m 'Initial Commit'").read() output = os.popen("git commit -m 'Initial Commit'").read()
assert "Initial Commit" in output assert "Initial Commit" in output
assert "4 files changed" in output assert "4 files changed" in output
assert "test_group/process_group.json" in output assert "test_group/process_group.json" in output
assert "test_group/test_sub_group/hello_world/hello_world.bpmn" in output assert "test_group/test_sub_group/hello_world/hello_world.bpmn" in output
assert "test_group/test_sub_group/hello_world/process_model.json" in output assert "test_group/test_sub_group/hello_world/process_model.json" in output
assert "test_group/test_sub_group/process_group.json" in output assert "test_group/test_sub_group/process_group.json" in output
output = os.popen("git status").read() # noqa: S605 output = GitService.run_shell_command_to_get_stdout(["git", "status"])
assert "On branch main" in output assert "On branch main" in output
assert "nothing to commit" in output assert "nothing to commit" in output
assert "working tree clean" in output assert "working tree clean" in output
output = os.popen("git branch --list").read() # noqa: S605 output = os.popen("git branch --list").read() # noqa: S605
assert output == "* main\n" assert output == "* main\n"
os.system("git branch staging") os.system("git branch staging")
output = os.popen("git branch --list").read() # noqa: S605 output = os.popen("git branch --list").read() # noqa: S605
assert output == "* main\n staging\n" assert output == "* main\n staging\n"
os.system("git checkout staging") os.system("git checkout staging")
output = os.popen("git status").read() # noqa: S605 output = GitService.run_shell_command_to_get_stdout(["git", "status"])
assert "On branch staging" in output assert "On branch staging" in output
assert "nothing to commit" in output assert "nothing to commit" in output
assert "working tree clean" in output assert "working tree clean" in output
# process_model = ProcessModelService.get_process_model(process_model_identifier) # process_model = ProcessModelService.get_process_model(process_model_identifier)
listing = os.listdir(process_model_absolute_dir) listing = os.listdir(process_model_absolute_dir)
assert len(listing) == 2 assert len(listing) == 2
assert "hello_world.bpmn" in listing assert "hello_world.bpmn" in listing
assert "process_model.json" in listing assert "process_model.json" in listing
os.system("git checkout main") os.system("git checkout main")
output = os.popen("git status").read() # noqa: S605 output = GitService.run_shell_command_to_get_stdout(["git", "status"])
assert "On branch main" in output assert "On branch main" in output
assert "nothing to commit" in output assert "nothing to commit" in output
assert "working tree clean" in output assert "working tree clean" in output
file_data = b"abc123" file_data = b"abc123"
new_file_path = os.path.join(process_model_absolute_dir, "new_file.txt") new_file_path = os.path.join(process_model_absolute_dir, "new_file.txt")
with open(new_file_path, "wb") as f_open: with open(new_file_path, "wb") as f_open:
f_open.write(file_data) f_open.write(file_data)
output = os.popen("git status").read() # noqa: S605 output = GitService.run_shell_command_to_get_stdout(["git", "status"])
assert "On branch main" in output assert "On branch main" in output
assert "Untracked files:" in output assert "Untracked files:" in output
assert "test_group/test_sub_group/hello_world/new_file.txt" in output assert "test_group/test_sub_group/hello_world/new_file.txt" in output
os.system( os.system(
"git add test_group/test_sub_group/hello_world/new_file.txt" "git add test_group/test_sub_group/hello_world/new_file.txt"
) # noqa: S605 ) # noqa: S605
output = os.popen("git commit -m 'add new_file.txt'").read() # noqa: S605 output = os.popen("git commit -m 'add new_file.txt'").read() # noqa: S605
assert "add new_file.txt" in output assert "add new_file.txt" in output
assert "1 file changed, 1 insertion(+)" in output assert "1 file changed, 1 insertion(+)" in output
assert "test_group/test_sub_group/hello_world/new_file.txt" in output assert "test_group/test_sub_group/hello_world/new_file.txt" in output
listing = os.listdir(process_model_absolute_dir) listing = os.listdir(process_model_absolute_dir)
assert len(listing) == 3 assert len(listing) == 3
assert "hello_world.bpmn" in listing assert "hello_world.bpmn" in listing
assert "process_model.json" in listing assert "process_model.json" in listing
assert "new_file.txt" in listing assert "new_file.txt" in listing
# modified_process_model_id = process_model_identifier.replace("/", ":") # modified_process_model_id = process_model_identifier.replace("/", ":")
# response = client.post( # response = client.post(
# f"/v1.0/process-models/{modified_process_model_id}/publish?branch_to_update=staging", # f"/v1.0/process-models/{modified_process_model_id}/publish?branch_to_update=staging",
# headers=self.logged_in_headers(with_super_admin_user), # headers=self.logged_in_headers(with_super_admin_user),
# ) # )
print("test_process_model_publish") print("test_process_model_publish")

2
spiffworkflow-frontend/src/routes/ProcessModelShow.tsx
View File

@ -536,7 +536,7 @@ export default function ProcessModelShow() {
onClose={() => setProcessModelPublished(false)} onClose={() => setProcessModelPublished(false)}
> >
<a href={prUrl} target="_void()"> <a href={prUrl} target="_void()">
view the changes and create a Pull Request View the changes and create a Pull Request
</a> </a>
</Notification> </Notification>
); );