{}'.format(json_value))
+
+class TaskEventView(AdminModelView):
+ column_filters = ['workflow_id', 'action']
+ column_list = ['study_id', 'user_id', 'workflow_id', 'action', 'task_title', 'form_data', 'date']
+ column_formatters = {
+ 'form_data': json_formatter,
+ }
+
+admin = Admin(app)
+
+admin.add_view(StudyView(StudyModel, db.session))
+admin.add_view(ApprovalView(ApprovalModel, db.session))
+admin.add_view(UserView(UserModel, db.session))
+admin.add_view(WorkflowView(WorkflowModel, db.session))
+admin.add_view(FileView(FileModel, db.session))
+admin.add_view(TaskEventView(TaskEventModel, db.session))
diff --git a/crc/api/approval.py b/crc/api/approval.py
index b3ee0fed..fd01e221 100644
--- a/crc/api/approval.py
+++ b/crc/api/approval.py
@@ -1,9 +1,11 @@
+import csv
+import io
import json
import pickle
from base64 import b64decode
from datetime import datetime
-from flask import g
+from flask import g, make_response
from crc import db, session
from crc.api.common import ApiError
@@ -88,71 +90,25 @@ def get_approvals_for_study(study_id=None):
return results
+def get_health_attesting_csv():
+ records = ApprovalService.get_health_attesting_records()
+ si = io.StringIO()
+ cw = csv.writer(si)
+ cw.writerows(records)
+ output = make_response(si.getvalue())
+ output.headers["Content-Disposition"] = "attachment; filename=health_attesting.csv"
+ output.headers["Content-type"] = "text/csv"
+ return output
+
+
# ----- Begin descent into madness ---- #
def get_csv():
"""A damn lie, it's a json file. A huge bit of a one-off for RRT, but 3 weeks of midnight work can convince a
man to do just about anything"""
- approvals = ApprovalService.get_all_approvals(include_cancelled=False)
- output = []
- errors = []
- for approval in approvals:
- try:
- if approval.status != ApprovalStatus.APPROVED.value:
- continue
- for related_approval in approval.related_approvals:
- if related_approval.status != ApprovalStatus.APPROVED.value:
- continue
- workflow = db.session.query(WorkflowModel).filter(WorkflowModel.id == approval.workflow_id).first()
- data = json.loads(workflow.bpmn_workflow_json)
- last_task = find_task(data['last_task']['__uuid__'], data['task_tree'])
- personnel = extract_value(last_task, 'personnel')
- training_val = extract_value(last_task, 'RequiredTraining')
- pi_supervisor = extract_value(last_task, 'PISupervisor')['value']
- review_complete = 'AllRequiredTraining' in training_val
- pi_uid = workflow.study.primary_investigator_id
- pi_details = LdapService.user_info(pi_uid)
- details = []
- details.append(pi_details)
- for person in personnel:
- uid = person['PersonnelComputingID']['value']
- details.append(LdapService.user_info(uid))
+ content = ApprovalService.get_not_really_csv_content()
- for person in details:
- record = {
- "study_id": approval.study_id,
- "pi_uid": pi_details.uid,
- "pi": pi_details.display_name,
- "name": person.display_name,
- "uid": person.uid,
- "email": person.email_address,
- "supervisor": "",
- "review_complete": review_complete,
- }
- # We only know the PI's supervisor.
- if person.uid == pi_details.uid:
- record["supervisor"] = pi_supervisor
+ return content
- output.append(record)
-
- except Exception as e:
- errors.append("Error pulling data for workflow #%i: %s" % (approval.workflow_id, str(e)))
- return {"results": output, "errors": errors }
-
-
-def extract_value(task, key):
- if key in task['data']:
- return pickle.loads(b64decode(task['data'][key]['__bytes__']))
- else:
- return ""
-
-
-def find_task(uuid, task):
- if task['id']['__uuid__'] == uuid:
- return task
- for child in task['children']:
- task = find_task(uuid, child)
- if task:
- return task
# ----- come back to the world of the living ---- #
diff --git a/crc/api/tools.py b/crc/api/tools.py
index d140e962..760d0d71 100644
--- a/crc/api/tools.py
+++ b/crc/api/tools.py
@@ -14,7 +14,7 @@ from crc.services.mails import send_test_email
def render_markdown(data, template):
"""
- Provides a quick way to very that a Jinja markdown template will work properly on a given json
+ Provides a quick way to very that a Jinja markdown template will work properly on a given json
data structure. Useful for folks that are building these markdown templates.
"""
try:
@@ -65,4 +65,4 @@ def send_email(address):
"""Just sends a quick test email to assure the system is working."""
if not address:
address = "dan@sartography.com"
- return send_test_email(address, [address])
\ No newline at end of file
+ return send_test_email(address, [address])
diff --git a/crc/api/workflow.py b/crc/api/workflow.py
index 655a85e7..2e35dad2 100644
--- a/crc/api/workflow.py
+++ b/crc/api/workflow.py
@@ -1,7 +1,7 @@
import uuid
+from SpiffWorkflow.util.deep_merge import DeepMerge
from flask import g
-
from crc import session, app
from crc.api.common import ApiError, ApiErrorSchema
from crc.models.api_models import WorkflowApi, WorkflowApiSchema, NavigationItem, NavigationItemSchema
@@ -96,59 +96,10 @@ def delete_workflow_specification(spec_id):
session.commit()
-def __get_workflow_api_model(processor: WorkflowProcessor, next_task = None):
- """Returns an API model representing the state of the current workflow, if requested, and
- possible, next_task is set to the current_task."""
-
- nav_dict = processor.bpmn_workflow.get_nav_list()
- navigation = []
- for nav_item in nav_dict:
- spiff_task = processor.bpmn_workflow.get_task(nav_item['task_id'])
- if 'description' in nav_item:
- nav_item['title'] = nav_item.pop('description')
- # fixme: duplicate code from the workflow_service. Should only do this in one place.
- if ' ' in nav_item['title']:
- nav_item['title'] = nav_item['title'].partition(' ')[2]
- else:
- nav_item['title'] = ""
- if spiff_task:
- nav_item['task'] = WorkflowService.spiff_task_to_api_task(spiff_task, add_docs_and_forms=False)
- nav_item['title'] = nav_item['task'].title # Prefer the task title.
- else:
- nav_item['task'] = None
- if not 'is_decision' in nav_item:
- nav_item['is_decision'] = False
-
- navigation.append(NavigationItem(**nav_item))
- NavigationItemSchema().dump(nav_item)
-
- spec = session.query(WorkflowSpecModel).filter_by(id=processor.workflow_spec_id).first()
- workflow_api = WorkflowApi(
- id=processor.get_workflow_id(),
- status=processor.get_status(),
- next_task=None,
- navigation=navigation,
- workflow_spec_id=processor.workflow_spec_id,
- spec_version=processor.get_version_string(),
- is_latest_spec=processor.is_latest_spec,
- total_tasks=len(navigation),
- completed_tasks=processor.workflow_model.completed_tasks,
- last_updated=processor.workflow_model.last_updated,
- title=spec.display_name
- )
- if not next_task: # The Next Task can be requested to be a certain task, useful for parallel tasks.
- # This may or may not work, sometimes there is no next task to complete.
- next_task = processor.next_task()
- if next_task:
- workflow_api.next_task = WorkflowService.spiff_task_to_api_task(next_task, add_docs_and_forms=True)
-
- return workflow_api
-
-
def get_workflow(workflow_id, soft_reset=False, hard_reset=False):
workflow_model: WorkflowModel = session.query(WorkflowModel).filter_by(id=workflow_id).first()
processor = WorkflowProcessor(workflow_model, soft_reset=soft_reset, hard_reset=hard_reset)
- workflow_api_model = __get_workflow_api_model(processor)
+ workflow_api_model = WorkflowService.processor_to_workflow_api(processor)
return WorkflowApiSchema().dump(workflow_api_model)
@@ -161,21 +112,24 @@ def set_current_task(workflow_id, task_id):
user_uid = __get_user_uid(workflow_model.study.user_uid)
processor = WorkflowProcessor(workflow_model)
task_id = uuid.UUID(task_id)
- task = processor.bpmn_workflow.get_task(task_id)
- if task.state != task.COMPLETED and task.state != task.READY:
+ spiff_task = processor.bpmn_workflow.get_task(task_id)
+ if spiff_task.state != spiff_task.COMPLETED and spiff_task.state != spiff_task.READY:
raise ApiError("invalid_state", "You may not move the token to a task who's state is not "
"currently set to COMPLETE or READY.")
# Only reset the token if the task doesn't already have it.
- if task.state == task.COMPLETED:
- task.reset_token(reset_data=False) # we could optionally clear the previous data.
+ if spiff_task.state == spiff_task.COMPLETED:
+ spiff_task.reset_token(reset_data=True) # Don't try to copy the existing data back into this task.
+
processor.save()
- WorkflowService.log_task_action(user_uid, processor, task, WorkflowService.TASK_ACTION_TOKEN_RESET)
- workflow_api_model = __get_workflow_api_model(processor, task)
+ WorkflowService.log_task_action(user_uid, workflow_model, spiff_task,
+ WorkflowService.TASK_ACTION_TOKEN_RESET,
+ version=processor.get_version_string())
+ workflow_api_model = WorkflowService.processor_to_workflow_api(processor, spiff_task)
return WorkflowApiSchema().dump(workflow_api_model)
-def update_task(workflow_id, task_id, body):
+def update_task(workflow_id, task_id, body, terminate_loop=None):
workflow_model = session.query(WorkflowModel).filter_by(id=workflow_id).first()
if workflow_model is None:
@@ -187,17 +141,21 @@ def update_task(workflow_id, task_id, body):
user_uid = __get_user_uid(workflow_model.study.user_uid)
processor = WorkflowProcessor(workflow_model)
task_id = uuid.UUID(task_id)
- task = processor.bpmn_workflow.get_task(task_id)
- if task.state != task.READY:
+ spiff_task = processor.bpmn_workflow.get_task(task_id)
+ if spiff_task.state != spiff_task.READY:
raise ApiError("invalid_state", "You may not update a task unless it is in the READY state. "
"Consider calling a token reset to make this task Ready.")
- task.update_data(body)
- processor.complete_task(task)
+ if terminate_loop:
+ spiff_task.terminate_loop()
+
+ spiff_task.update_data(body)
+ processor.complete_task(spiff_task)
processor.do_engine_steps()
processor.save()
- WorkflowService.log_task_action(user_uid, processor, task, WorkflowService.TASK_ACTION_COMPLETE)
- workflow_api_model = __get_workflow_api_model(processor)
+ WorkflowService.log_task_action(user_uid, workflow_model, spiff_task, WorkflowService.TASK_ACTION_COMPLETE,
+ version=processor.get_version_string())
+ workflow_api_model = WorkflowService.processor_to_workflow_api(processor)
return WorkflowApiSchema().dump(workflow_api_model)
diff --git a/crc/models/api_models.py b/crc/models/api_models.py
index 53706a75..361b9183 100644
--- a/crc/models/api_models.py
+++ b/crc/models/api_models.py
@@ -36,6 +36,7 @@ class Task(object):
PROP_OPTIONS_FILE = "spreadsheet.name"
PROP_OPTIONS_VALUE_COLUMN = "spreadsheet.value.column"
PROP_OPTIONS_LABEL_COL = "spreadsheet.label.column"
+ PROP_OPTIONS_READ_ONLY = "read_only"
PROP_LDAP_LOOKUP = "ldap.lookup"
VALIDATION_REQUIRED = "required"
FIELD_TYPE_AUTO_COMPLETE = "autocomplete"
diff --git a/crc/models/email.py b/crc/models/email.py
new file mode 100644
index 00000000..dc8c6834
--- /dev/null
+++ b/crc/models/email.py
@@ -0,0 +1,18 @@
+from flask_marshmallow.sqla import SQLAlchemyAutoSchema
+from marshmallow import EXCLUDE
+from sqlalchemy import func
+
+from crc import db
+from crc.models.study import StudyModel
+
+
+class EmailModel(db.Model):
+ __tablename__ = 'email'
+ id = db.Column(db.Integer, primary_key=True)
+ subject = db.Column(db.String)
+ sender = db.Column(db.String)
+ recipients = db.Column(db.String)
+ content = db.Column(db.String)
+ content_html = db.Column(db.String)
+ study_id = db.Column(db.Integer, db.ForeignKey(StudyModel.id), nullable=True)
+ study = db.relationship(StudyModel)
diff --git a/crc/models/ldap.py b/crc/models/ldap.py
index 7e05eccd..802e0d36 100644
--- a/crc/models/ldap.py
+++ b/crc/models/ldap.py
@@ -29,6 +29,9 @@ class LdapModel(db.Model):
affiliation=", ".join(entry.uvaPersonIAMAffiliation),
sponsor_type=", ".join(entry.uvaPersonSponsoredType))
+ def proper_name(self):
+ return f'{self.display_name} - ({self.uid})'
+
class LdapSchema(SQLAlchemyAutoSchema):
class Meta:
diff --git a/crc/models/stats.py b/crc/models/stats.py
index c72df7d4..0a2e69b7 100644
--- a/crc/models/stats.py
+++ b/crc/models/stats.py
@@ -17,6 +17,7 @@ class TaskEventModel(db.Model):
task_title = db.Column(db.String)
task_type = db.Column(db.String)
task_state = db.Column(db.String)
+ form_data = db.Column(db.JSON) # And form data submitted when the task was completed.
mi_type = db.Column(db.String)
mi_count = db.Column(db.Integer)
mi_index = db.Column(db.Integer)
diff --git a/crc/scripts/email.py b/crc/scripts/email.py
new file mode 100644
index 00000000..6f8244dd
--- /dev/null
+++ b/crc/scripts/email.py
@@ -0,0 +1,91 @@
+import markdown
+from jinja2 import Template
+
+from crc import app
+from crc.api.common import ApiError
+from crc.scripts.script import Script
+from crc.services.ldap_service import LdapService
+from crc.services.mails import send_mail
+
+
+class Email(Script):
+ """This Script allows to be introduced as part of a workflow and called from there, specifying
+ recipients and content """
+
+ def get_description(self):
+ return """
+Creates an email, using the provided arguments (a list of UIDs)"
+Each argument will be used to look up personal information needed for
+the email creation.
+
+Example:
+Email Subject ApprvlApprvr1 PIComputingID
+"""
+
+ def do_task_validate_only(self, task, *args, **kwargs):
+ self.get_subject(task, args)
+ self.get_users_info(task, args)
+ self.get_content(task)
+
+ def do_task(self, task, *args, **kwargs):
+ args = [arg for arg in args if type(arg) == str]
+ subject = self.get_subject(task, args)
+ recipients = self.get_users_info(task, args)
+ content, content_html = self.get_content(task)
+ if recipients:
+ send_mail(
+ subject=subject,
+ sender=app.config['DEFAULT_SENDER'],
+ recipients=recipients,
+ content=content,
+ content_html=content_html
+ )
+
+ def get_users_info(self, task, args):
+ if len(args) < 1:
+ raise ApiError(code="missing_argument",
+ message="Email script requires at least one argument. The "
+ "name of the variable in the task data that contains user"
+ "id to process. Multiple arguments are accepted.")
+ emails = []
+ for arg in args:
+ try:
+ uid = task.workflow.script_engine.evaluate_expression(task, arg)
+ except Exception as e:
+ app.logger.error(f'Workflow engines could not parse {arg}')
+ app.logger.error(str(e))
+ continue
+ user_info = LdapService.user_info(uid)
+ email = user_info.email_address
+ emails.append(user_info.email_address)
+ if not isinstance(email, str):
+ raise ApiError(code="invalid_argument",
+ message="The Email script requires at least 1 UID argument. The "
+ "name of the variable in the task data that contains subject and"
+ " user ids to process. This must point to an array or a string, but "
+ "it currently points to a %s " % emails.__class__.__name__)
+
+ return emails
+
+ def get_subject(self, task, args):
+ if len(args) < 1:
+ raise ApiError(code="missing_argument",
+ message="Email script requires at least one subject argument. The "
+ "name of the variable in the task data that contains subject"
+ " to process. Multiple arguments are accepted.")
+ subject = args[0]
+ if not isinstance(subject, str):
+ raise ApiError(code="invalid_argument",
+ message="The Email script requires 1 argument. The "
+ "the name of the variable in the task data that contains user"
+ "ids to process. This must point to an array or a string, but "
+ "it currently points to a %s " % subject.__class__.__name__)
+
+ return subject
+
+ def get_content(self, task):
+ content = task.task_spec.documentation
+ template = Template(content)
+ rendered = template.render(task.data)
+ rendered_markdown = markdown.markdown(rendered).replace('\n', 'Hypertext Markup Language content for this email
' + + EmailService.add_email(subject=subject, sender=sender, recipients=recipients, + content=content, content_html=content_html, study_id=study.id) + + email_model = EmailModel.query.first() + + self.assertEqual(email_model.subject, subject) + self.assertEqual(email_model.sender, sender) + self.assertEqual(email_model.recipients, str(recipients)) + self.assertEqual(email_model.content, content) + self.assertEqual(email_model.content_html, content_html) + self.assertEqual(email_model.study, study) + + # TODO: Create email model without study diff --git a/tests/emails/test_mails.py b/tests/emails/test_mails.py new file mode 100644 index 00000000..0710e02e --- /dev/null +++ b/tests/emails/test_mails.py @@ -0,0 +1,117 @@ + +from tests.base_test import BaseTest + +from crc import mail, session +from crc.models.approval import ApprovalModel, ApprovalStatus +from crc.models.email import EmailModel +from crc.services.mails import ( + send_ramp_up_submission_email, + send_ramp_up_approval_request_email, + send_ramp_up_approval_request_first_review_email, + send_ramp_up_approved_email, + send_ramp_up_denied_email, + send_ramp_up_denied_email_to_approver +) + + +class TestMails(BaseTest): + + def setUp(self): + """Initial setup shared by all TestApprovals tests""" + self.load_example_data() + self.study = self.create_study() + self.workflow = self.create_workflow('random_fact') + + self.sender = 'sender@sartography.com' + self.recipients = ['recipient@sartography.com'] + self.primary_investigator = 'Dr. Bartlett' + self.approver_1 = 'Max Approver' + self.approver_2 = 'Close Reviewer' + + def test_send_ramp_up_submission_email(self): + with mail.record_messages() as outbox: + + send_ramp_up_submission_email(self.sender, self.recipients, self.approver_1) + self.assertEqual(len(outbox), 1) + self.assertEqual(outbox[0].subject, 'Research Ramp-up Plan Submitted') + self.assertIn(self.approver_1, outbox[0].body) + self.assertIn(self.approver_1, outbox[0].html) + + send_ramp_up_submission_email(self.sender, self.recipients, self.approver_1, self.approver_2) + self.assertEqual(len(outbox), 2) + self.assertIn(self.approver_1, outbox[1].body) + self.assertIn(self.approver_1, outbox[1].html) + self.assertIn(self.approver_2, outbox[1].body) + self.assertIn(self.approver_2, outbox[1].html) + + db_emails = EmailModel.query.count() + self.assertEqual(db_emails, 2) + + def test_send_ramp_up_approval_request_email(self): + with mail.record_messages() as outbox: + send_ramp_up_approval_request_email(self.sender, self.recipients, self.primary_investigator) + + self.assertEqual(len(outbox), 1) + self.assertEqual(outbox[0].subject, 'Research Ramp-up Plan Approval Request') + self.assertIn(self.primary_investigator, outbox[0].body) + self.assertIn(self.primary_investigator, outbox[0].html) + + db_emails = EmailModel.query.count() + self.assertEqual(db_emails, 1) + + def test_send_ramp_up_approval_request_first_review_email(self): + with mail.record_messages() as outbox: + send_ramp_up_approval_request_first_review_email( + self.sender, self.recipients, self.primary_investigator + ) + + self.assertEqual(len(outbox), 1) + self.assertEqual(outbox[0].subject, 'Research Ramp-up Plan Approval Request') + self.assertIn(self.primary_investigator, outbox[0].body) + self.assertIn(self.primary_investigator, outbox[0].html) + + db_emails = EmailModel.query.count() + self.assertEqual(db_emails, 1) + + def test_send_ramp_up_approved_email(self): + with mail.record_messages() as outbox: + send_ramp_up_approved_email(self.sender, self.recipients, self.approver_1) + self.assertEqual(len(outbox), 1) + self.assertEqual(outbox[0].subject, 'Research Ramp-up Plan Approved') + self.assertIn(self.approver_1, outbox[0].body) + self.assertIn(self.approver_1, outbox[0].html) + + send_ramp_up_approved_email(self.sender, self.recipients, self.approver_1, self.approver_2) + self.assertEqual(len(outbox), 2) + self.assertIn(self.approver_1, outbox[1].body) + self.assertIn(self.approver_1, outbox[1].html) + self.assertIn(self.approver_2, outbox[1].body) + self.assertIn(self.approver_2, outbox[1].html) + + db_emails = EmailModel.query.count() + self.assertEqual(db_emails, 2) + + def test_send_ramp_up_denied_email(self): + with mail.record_messages() as outbox: + send_ramp_up_denied_email(self.sender, self.recipients, self.approver_1) + self.assertEqual(outbox[0].subject, 'Research Ramp-up Plan Denied') + self.assertIn(self.approver_1, outbox[0].body) + self.assertIn(self.approver_1, outbox[0].html) + + db_emails = EmailModel.query.count() + self.assertEqual(db_emails, 1) + + def test_send_send_ramp_up_denied_email_to_approver(self): + with mail.record_messages() as outbox: + send_ramp_up_denied_email_to_approver( + self.sender, self.recipients, self.primary_investigator, self.approver_2 + ) + + self.assertEqual(outbox[0].subject, 'Research Ramp-up Plan Denied') + self.assertIn(self.primary_investigator, outbox[0].body) + self.assertIn(self.primary_investigator, outbox[0].html) + self.assertIn(self.approver_2, outbox[0].body) + self.assertIn(self.approver_2, outbox[0].html) + + db_emails = EmailModel.query.count() + self.assertEqual(db_emails, 1) diff --git a/tests/test_file_service.py b/tests/files/test_file_service.py similarity index 98% rename from tests/test_file_service.py rename to tests/files/test_file_service.py index 1dea810c..dd95e458 100644 --- a/tests/test_file_service.py +++ b/tests/files/test_file_service.py @@ -61,14 +61,14 @@ class TestFileService(BaseTest): # Archive the file file_models = FileService.get_workflow_files(workflow_id=workflow.id) - self.assertEquals(1, len(file_models)) + self.assertEqual(1, len(file_models)) file_model = file_models[0] file_model.archived = True db.session.add(file_model) # Assure that the file no longer comes back. file_models = FileService.get_workflow_files(workflow_id=workflow.id) - self.assertEquals(0, len(file_models)) + self.assertEqual(0, len(file_models)) # Add the file again with different data FileService.add_workflow_file(workflow_id=workflow.id, diff --git a/tests/test_files_api.py b/tests/files/test_files_api.py similarity index 98% rename from tests/test_files_api.py rename to tests/files/test_files_api.py index 2d14a8b5..59e6c1f6 100644 --- a/tests/test_files_api.py +++ b/tests/files/test_files_api.py @@ -91,7 +91,6 @@ class TestFilesApi(BaseTest): content_type='multipart/form-data', headers=self.logged_in_headers()) self.assert_success(rv) - def test_archive_file_no_longer_shows_up(self): self.load_example_data() self.create_reference_document() @@ -109,21 +108,16 @@ class TestFilesApi(BaseTest): self.assert_success(rv) rv = self.app.get('/v1.0/file?workflow_id=%s' % workflow.id, headers=self.logged_in_headers()) self.assert_success(rv) - self.assertEquals(1, len(json.loads(rv.get_data(as_text=True)))) + self.assertEqual(1, len(json.loads(rv.get_data(as_text=True)))) file_model = db.session.query(FileModel).filter(FileModel.workflow_id == workflow.id).all() - self.assertEquals(1, len(file_model)) + self.assertEqual(1, len(file_model)) file_model[0].archived = True db.session.commit() rv = self.app.get('/v1.0/file?workflow_id=%s' % workflow.id, headers=self.logged_in_headers()) self.assert_success(rv) - self.assertEquals(0, len(json.loads(rv.get_data(as_text=True)))) - - - - - + self.assertEqual(0, len(json.loads(rv.get_data(as_text=True)))) def test_set_reference_file(self): file_name = "irb_document_types.xls" @@ -285,8 +279,8 @@ class TestFilesApi(BaseTest): .filter(ApprovalModel.status == ApprovalStatus.PENDING.value)\ .filter(ApprovalModel.study_id == workflow.study_id).all() - self.assertEquals(1, len(approvals)) - self.assertEquals(1, len(approvals[0].approval_files)) + self.assertEqual(1, len(approvals)) + self.assertEqual(1, len(approvals[0].approval_files)) def test_change_primary_bpmn(self): diff --git a/tests/test_study_api.py b/tests/study/test_study_api.py similarity index 100% rename from tests/test_study_api.py rename to tests/study/test_study_api.py diff --git a/tests/test_study_details_documents.py b/tests/study/test_study_details_documents.py similarity index 100% rename from tests/test_study_details_documents.py rename to tests/study/test_study_details_documents.py diff --git a/tests/test_study_service.py b/tests/study/test_study_service.py similarity index 100% rename from tests/test_study_service.py rename to tests/study/test_study_service.py diff --git a/tests/test_update_study_script.py b/tests/study/test_update_study_script.py similarity index 100% rename from tests/test_update_study_script.py rename to tests/study/test_update_study_script.py diff --git a/tests/test_looping_task.py b/tests/test_looping_task.py new file mode 100644 index 00000000..e56e0877 --- /dev/null +++ b/tests/test_looping_task.py @@ -0,0 +1,54 @@ +from unittest.mock import patch + +from crc import session +from crc.models.api_models import MultiInstanceType +from crc.models.study import StudyModel +from crc.models.workflow import WorkflowStatus +from crc.services.study_service import StudyService +from crc.services.workflow_processor import WorkflowProcessor +from crc.services.workflow_service import WorkflowService +from tests.base_test import BaseTest + + +class TestWorkflowProcessorLoopingTask(BaseTest): + """Tests the Workflow Processor as it deals with a Looping task""" + + def _populate_form_with_random_data(self, task): + api_task = WorkflowService.spiff_task_to_api_task(task, add_docs_and_forms=True) + WorkflowService.populate_form_with_random_data(task, api_task, required_only=False) + + def get_processor(self, study_model, spec_model): + workflow_model = StudyService._create_workflow_model(study_model, spec_model) + return WorkflowProcessor(workflow_model) + + def test_create_and_complete_workflow(self): + # This depends on getting a list of investigators back from the protocol builder. + + workflow = self.create_workflow('looping_task') + task = self.get_workflow_api(workflow).next_task + + self.assertEqual("GetNames", task.name) + + self.assertEqual(task.multi_instance_type, 'looping') + self.assertEqual(1, task.multi_instance_index) + self.complete_form(workflow,task,{'GetNames_CurrentVar':{'Name': 'Peter Norvig', 'Nickname': 'Pete'}}) + task = self.get_workflow_api(workflow).next_task + + self.assertEqual(task.multi_instance_type,'looping') + self.assertEqual(2, task.multi_instance_index) + self.complete_form(workflow, + task, + {'GetNames_CurrentVar':{'Name': 'Stuart Russell', 'Nickname': 'Stu'}}, + terminate_loop=True) + + task = self.get_workflow_api(workflow).next_task + self.assertEqual(task.name,'Event_End') + self.assertEqual(workflow.completed_tasks,workflow.total_tasks) + self.assertEqual(task.data, {'GetNames_CurrentVar': 2, + 'GetNames': {'1': {'Name': 'Peter Norvig', + 'Nickname': 'Pete'}, + '2': {'Name': 'Stuart Russell', + 'Nickname': 'Stu'}}}) + + + diff --git a/tests/test_mails.py b/tests/test_mails.py deleted file mode 100644 index 15a01583..00000000 --- a/tests/test_mails.py +++ /dev/null @@ -1,55 +0,0 @@ - -from tests.base_test import BaseTest - -from crc.services.mails import ( - send_ramp_up_submission_email, - send_ramp_up_approval_request_email, - send_ramp_up_approval_request_first_review_email, - send_ramp_up_approved_email, - send_ramp_up_denied_email, - send_ramp_up_denied_email_to_approver -) - - -class TestMails(BaseTest): - - def setUp(self): - self.sender = 'sender@sartography.com' - self.recipients = ['recipient@sartography.com'] - self.primary_investigator = 'Dr. Bartlett' - self.approver_1 = 'Max Approver' - self.approver_2 = 'Close Reviewer' - - def test_send_ramp_up_submission_email(self): - send_ramp_up_submission_email(self.sender, self.recipients, self.approver_1) - self.assertTrue(True) - - send_ramp_up_submission_email(self.sender, self.recipients, self.approver_1, self.approver_2) - self.assertTrue(True) - - def test_send_ramp_up_approval_request_email(self): - send_ramp_up_approval_request_email(self.sender, self.recipients, self.primary_investigator) - self.assertTrue(True) - - def test_send_ramp_up_approval_request_first_review_email(self): - send_ramp_up_approval_request_first_review_email( - self.sender, self.recipients, self.primary_investigator - ) - self.assertTrue(True) - - def test_send_ramp_up_approved_email(self): - send_ramp_up_approved_email(self.sender, self.recipients, self.approver_1) - self.assertTrue(True) - - send_ramp_up_approved_email(self.sender, self.recipients, self.approver_1, self.approver_2) - self.assertTrue(True) - - def test_send_ramp_up_denied_email(self): - send_ramp_up_denied_email(self.sender, self.recipients, self.approver_1) - self.assertTrue(True) - - def test_send_send_ramp_up_denied_email_to_approver(self): - send_ramp_up_denied_email_to_approver( - self.sender, self.recipients, self.primary_investigator, self.approver_2 - ) - self.assertTrue(True) diff --git a/tests/test_tasks_api.py b/tests/test_tasks_api.py index 654b777e..c6b09dae 100644 --- a/tests/test_tasks_api.py +++ b/tests/test_tasks_api.py @@ -4,14 +4,86 @@ import random from unittest.mock import patch from tests.base_test import BaseTest + from crc import session, app from crc.models.api_models import WorkflowApiSchema, MultiInstanceType, TaskSchema from crc.models.file import FileModelSchema from crc.models.workflow import WorkflowStatus - +from crc.services.workflow_service import WorkflowService +from crc.models.stats import TaskEventModel class TestTasksApi(BaseTest): + def get_workflow_api(self, workflow, soft_reset=False, hard_reset=False): + rv = self.app.get('/v1.0/workflow/%i?soft_reset=%s&hard_reset=%s' % + (workflow.id, str(soft_reset), str(hard_reset)), + headers=self.logged_in_headers(), + content_type="application/json") + self.assert_success(rv) + json_data = json.loads(rv.get_data(as_text=True)) + workflow_api = WorkflowApiSchema().load(json_data) + self.assertEqual(workflow.workflow_spec_id, workflow_api.workflow_spec_id) + return workflow_api + + def complete_form(self, workflow_in, task_in, dict_data, error_code = None): + prev_completed_task_count = workflow_in.completed_tasks + if isinstance(task_in, dict): + task_id = task_in["id"] + else: + task_id = task_in.id + rv = self.app.put('/v1.0/workflow/%i/task/%s/data' % (workflow_in.id, task_id), + headers=self.logged_in_headers(), + content_type="application/json", + data=json.dumps(dict_data)) + if error_code: + self.assert_failure(rv, error_code=error_code) + return + + self.assert_success(rv) + json_data = json.loads(rv.get_data(as_text=True)) + + # Assure stats are updated on the model + workflow = WorkflowApiSchema().load(json_data) + # The total number of tasks may change over time, as users move through gateways + # branches may be pruned. As we hit parallel Multi-Instance new tasks may be created... + self.assertIsNotNone(workflow.total_tasks) + self.assertEqual(prev_completed_task_count + 1, workflow.completed_tasks) + # Assure a record exists in the Task Events + task_events = session.query(TaskEventModel) \ + .filter_by(workflow_id=workflow.id) \ + .filter_by(task_id=task_id) \ + .order_by(TaskEventModel.date.desc()).all() + self.assertGreater(len(task_events), 0) + event = task_events[0] + self.assertIsNotNone(event.study_id) + self.assertEqual("dhf8r", event.user_uid) + self.assertEqual(workflow.id, event.workflow_id) + self.assertEqual(workflow.workflow_spec_id, event.workflow_spec_id) + self.assertEqual(workflow.spec_version, event.spec_version) + self.assertEqual(WorkflowService.TASK_ACTION_COMPLETE, event.action) + self.assertEqual(task_in.id, task_id) + self.assertEqual(task_in.name, event.task_name) + self.assertEqual(task_in.title, event.task_title) + self.assertEqual(task_in.type, event.task_type) + self.assertEqual("COMPLETED", event.task_state) + # Not sure what vodoo is happening inside of marshmallow to get me in this state. + if isinstance(task_in.multi_instance_type, MultiInstanceType): + self.assertEqual(task_in.multi_instance_type.value, event.mi_type) + else: + self.assertEqual(task_in.multi_instance_type, event.mi_type) + + self.assertEqual(task_in.multi_instance_count, event.mi_count) + self.assertEqual(task_in.multi_instance_index, event.mi_index) + self.assertEqual(task_in.process_name, event.process_name) + self.assertIsNotNone(event.date) + + # Assure that there is data in the form_data + self.assertIsNotNone(event.form_data) + + workflow = WorkflowApiSchema().load(json_data) + return workflow + + def test_get_current_user_tasks(self): self.load_example_data() workflow = self.create_workflow('random_fact') @@ -299,13 +371,13 @@ class TestTasksApi(BaseTest): self.assertEqual("UserTask", task.type) self.assertEqual("Activity_A", task.name) self.assertEqual("My Sub Process", task.process_name) - workflow_api = self.complete_form(workflow, task, {"name": "Dan"}) + workflow_api = self.complete_form(workflow, task, {"FieldA": "Dan"}) task = workflow_api.next_task self.assertIsNotNone(task) self.assertEqual("Activity_B", task.name) self.assertEqual("Sub Workflow Example", task.process_name) - workflow_api = self.complete_form(workflow, task, {"name": "Dan"}) + workflow_api = self.complete_form(workflow, task, {"FieldB": "Dan"}) self.assertEqual(WorkflowStatus.complete, workflow_api.status) def test_update_task_resets_token(self): @@ -368,12 +440,14 @@ class TestTasksApi(BaseTest): self.assertEqual(9, len(ready_items)) self.assertEqual("UserTask", workflow_api.next_task.type) - self.assertEqual("MutiInstanceTask",workflow_api.next_task.name) + self.assertEqual("MultiInstanceTask",workflow_api.next_task.name) self.assertEqual("more information", workflow_api.next_task.title) for i in random.sample(range(9), 9): task = TaskSchema().load(ready_items[i]['task']) - self.complete_form(workflow, task, {"investigator":{"email": "dhf8r@virginia.edu"}}) + data = workflow_api.next_task.data + data['investigator']['email'] = "dhf8r@virginia.edu" + self.complete_form(workflow, task, data) #tasks = self.get_workflow_api(workflow).user_tasks workflow = self.get_workflow_api(workflow) diff --git a/tests/test_workflow_processor.py b/tests/workflow/test_workflow_processor.py similarity index 87% rename from tests/test_workflow_processor.py rename to tests/workflow/test_workflow_processor.py index b3f6c374..30f9150b 100644 --- a/tests/test_workflow_processor.py +++ b/tests/workflow/test_workflow_processor.py @@ -270,53 +270,6 @@ class TestWorkflowProcessor(BaseTest): processor = self.get_processor(study, workflow_spec_model) self.assertTrue(processor.get_version_string().startswith('v2.1.1')) - def test_restart_workflow(self): - self.load_example_data() - study = session.query(StudyModel).first() - workflow_spec_model = self.load_test_spec("two_forms") - processor = self.get_processor(study, workflow_spec_model) - self.assertEqual(processor.workflow_model.workflow_spec_id, workflow_spec_model.id) - task = processor.next_task() - task.data = {"key": "Value"} - processor.complete_task(task) - task_before_restart = processor.next_task() - processor.hard_reset() - task_after_restart = processor.next_task() - - self.assertNotEqual(task.get_name(), task_before_restart.get_name()) - self.assertEqual(task.get_name(), task_after_restart.get_name()) - self.assertEqual(task.data, task_after_restart.data) - - def test_soft_reset(self): - self.load_example_data() - - # Start the two_forms workflow, and enter some data in the first form. - study = session.query(StudyModel).first() - workflow_spec_model = self.load_test_spec("two_forms") - processor = self.get_processor(study, workflow_spec_model) - self.assertEqual(processor.workflow_model.workflow_spec_id, workflow_spec_model.id) - task = processor.next_task() - task.data = {"color": "blue"} - processor.complete_task(task) - - # Modify the specification, with a minor text change. - file_path = os.path.join(app.root_path, '..', 'tests', 'data', 'two_forms', 'mods', 'two_forms_text_mod.bpmn') - self.replace_file("two_forms.bpmn", file_path) - - # Setting up another processor should not error out, but doesn't pick up the update. - processor.workflow_model.bpmn_workflow_json = processor.serialize() - processor2 = WorkflowProcessor(processor.workflow_model) - self.assertEqual("Step 1", processor2.bpmn_workflow.last_task.task_spec.description) - self.assertNotEqual("# This is some documentation I wanted to add.", - processor2.bpmn_workflow.last_task.task_spec.documentation) - - # You can do a soft update and get the right response. - processor3 = WorkflowProcessor(processor.workflow_model, soft_reset=True) - self.assertEqual("Step 1", processor3.bpmn_workflow.last_task.task_spec.description) - self.assertEqual("# This is some documentation I wanted to add.", - processor3.bpmn_workflow.last_task.task_spec.documentation) - - def test_hard_reset(self): self.load_example_data() @@ -344,8 +297,10 @@ class TestWorkflowProcessor(BaseTest): # Do a hard reset, which should bring us back to the beginning, but retain the data. processor3 = WorkflowProcessor(processor.workflow_model, hard_reset=True) self.assertEqual("Step 1", processor3.next_task().task_spec.description) - self.assertEqual({"color": "blue"}, processor3.next_task().data) - processor3.complete_task(processor3.next_task()) + self.assertTrue(processor3.is_latest_spec) # Now at version 2. + task = processor3.next_task() + task.data = {"color": "blue"} + processor3.complete_task(task) self.assertEqual("New Step", processor3.next_task().task_spec.description) self.assertEqual("blue", processor3.next_task().data["color"]) diff --git a/tests/test_workflow_processor_multi_instance.py b/tests/workflow/test_workflow_processor_multi_instance.py similarity index 64% rename from tests/test_workflow_processor_multi_instance.py rename to tests/workflow/test_workflow_processor_multi_instance.py index aefb73f1..76821fed 100644 --- a/tests/test_workflow_processor_multi_instance.py +++ b/tests/workflow/test_workflow_processor_multi_instance.py @@ -1,13 +1,13 @@ from unittest.mock import patch +from tests.base_test import BaseTest -from crc import session +from crc import session, db from crc.models.api_models import MultiInstanceType from crc.models.study import StudyModel -from crc.models.workflow import WorkflowStatus +from crc.models.workflow import WorkflowStatus, WorkflowModel from crc.services.study_service import StudyService from crc.services.workflow_processor import WorkflowProcessor from crc.services.workflow_service import WorkflowService -from tests.base_test import BaseTest class TestWorkflowProcessorMultiInstance(BaseTest): @@ -32,7 +32,7 @@ class TestWorkflowProcessorMultiInstance(BaseTest): 'error': 'Unable to locate a user with id asd3v in LDAP'}} def _populate_form_with_random_data(self, task): - WorkflowProcessor.populate_form_with_random_data(task) + WorkflowService.populate_form_with_random_data(task) def get_processor(self, study_model, spec_model): workflow_model = StudyService._create_workflow_model(study_model, spec_model) @@ -51,51 +51,72 @@ class TestWorkflowProcessorMultiInstance(BaseTest): self.assertIsNotNone(processor) self.assertEqual(WorkflowStatus.user_input_required, processor.get_status()) processor.bpmn_workflow.do_engine_steps() - next_user_tasks = processor.next_user_tasks() - self.assertEqual(1, len(next_user_tasks)) - - task = next_user_tasks[0] + workflow_api = WorkflowService.processor_to_workflow_api(processor) + self.assertIsNotNone(workflow_api) + self.assertIsNotNone(workflow_api.next_task) + # 1st investigator + api_task = workflow_api.next_task self.assertEqual(WorkflowStatus.user_input_required, processor.get_status()) - self.assertEqual("dhf8r", task.data["investigator"]["user_id"]) - - self.assertEqual("MutiInstanceTask", task.get_name()) - api_task = WorkflowService.spiff_task_to_api_task(task) - self.assertEqual(MultiInstanceType.sequential, api_task.multi_instance_type) + self.assertEqual("dhf8r", api_task.data["investigator"]["user_id"]) + self.assertEqual("MultiInstanceTask", api_task.name) self.assertEqual(3, api_task.multi_instance_count) self.assertEqual(1, api_task.multi_instance_index) - task.update_data({"investigator":{"email":"asd3v@virginia.edu"}}) + + task = processor.get_current_user_tasks()[0] + self.assertEqual(task.id, api_task.id) + task.update_data({"investigator": {"email": "asd3v@virginia.edu"}}) processor.complete_task(task) processor.do_engine_steps() + workflow_api = WorkflowService.processor_to_workflow_api(processor) - task = next_user_tasks[0] - api_task = WorkflowService.spiff_task_to_api_task(task) - self.assertEqual("MutiInstanceTask", api_task.name) - task.update_data({"investigator":{"email":"asdf32@virginia.edu"}}) + # 2nd investigator + api_task = workflow_api.next_task + self.assertEqual(WorkflowStatus.user_input_required, processor.get_status()) + self.assertEqual(None, api_task.data["investigator"]["user_id"]) + self.assertEqual("MultiInstanceTask", api_task.name) self.assertEqual(3, api_task.multi_instance_count) self.assertEqual(2, api_task.multi_instance_index) + + task = processor.get_current_user_tasks()[0] + self.assertEqual(task.id, api_task.id) + task.update_data({"investigator": {"email": "asdf32@virginia.edu"}}) processor.complete_task(task) processor.do_engine_steps() + workflow_api = WorkflowService.processor_to_workflow_api(processor) - task = next_user_tasks[0] - api_task = WorkflowService.spiff_task_to_api_task(task) - self.assertEqual("MutiInstanceTask", task.get_name()) - task.update_data({"investigator":{"email":"dhf8r@virginia.edu"}}) + # 3rd investigator + api_task = workflow_api.next_task + self.assertEqual(WorkflowStatus.user_input_required, processor.get_status()) + self.assertEqual("asd3v", api_task.data["investigator"]["user_id"]) + self.assertEqual("MultiInstanceTask", api_task.name) self.assertEqual(3, api_task.multi_instance_count) self.assertEqual(3, api_task.multi_instance_index) + + task = processor.get_current_user_tasks()[0] + self.assertEqual(task.id, api_task.id) + task.update_data({"investigator": {"email": "dhf8r@virginia.edu"}}) processor.complete_task(task) processor.do_engine_steps() - task = processor.bpmn_workflow.last_task + workflow_api = WorkflowService.processor_to_workflow_api(processor) + + # Last task + api_task = workflow_api.next_task expected = self.mock_investigator_response expected['PI']['email'] = "asd3v@virginia.edu" expected['SC_I']['email'] = "asdf32@virginia.edu" expected['DC']['email'] = "dhf8r@virginia.edu" - self.assertEqual(expected, - task.data['StudyInfo']['investigators']) + self.assertEqual(expected, api_task.data['StudyInfo']['investigators']) self.assertEqual(WorkflowStatus.complete, processor.get_status()) + def refresh_processor(self, processor): + """Saves the processor, and returns a new one read in from the database""" + processor.save() + processor = WorkflowProcessor(processor.workflow_model) + return processor + @patch('crc.services.study_service.StudyService.get_investigators') def test_create_and_complete_workflow_parallel(self, mock_study_service): """Unlike the test above, the parallel task allows us to complete the items in any order.""" @@ -107,11 +128,15 @@ class TestWorkflowProcessorMultiInstance(BaseTest): workflow_spec_model = self.load_test_spec("multi_instance_parallel") study = session.query(StudyModel).first() processor = self.get_processor(study, workflow_spec_model) + processor = self.refresh_processor(processor) processor.bpmn_workflow.do_engine_steps() # In the Parallel instance, there should be three tasks, all of them in the ready state. next_user_tasks = processor.next_user_tasks() self.assertEqual(3, len(next_user_tasks)) + # There should be six tasks in the navigation: start event, the script task, end event, and three tasks + # for the three executions of hte multi-instance. + self.assertEquals(6, len(processor.bpmn_workflow.get_nav_list())) # We can complete the tasks out of order. task = next_user_tasks[2] @@ -121,23 +146,26 @@ class TestWorkflowProcessorMultiInstance(BaseTest): api_task = WorkflowService.spiff_task_to_api_task(task) self.assertEqual(MultiInstanceType.parallel, api_task.multi_instance_type) - task.update_data({"investigator":{"email":"dhf8r@virginia.edu"}}) + task.update_data({"investigator": {"email": "dhf8r@virginia.edu"}}) processor.complete_task(task) processor.do_engine_steps() + self.assertEquals(6, len(processor.bpmn_workflow.get_nav_list())) task = next_user_tasks[0] api_task = WorkflowService.spiff_task_to_api_task(task) - self.assertEqual("MutiInstanceTask", api_task.name) + self.assertEqual("MultiInstanceTask", api_task.name) task.update_data({"investigator":{"email":"asd3v@virginia.edu"}}) processor.complete_task(task) processor.do_engine_steps() + self.assertEquals(6, len(processor.bpmn_workflow.get_nav_list())) task = next_user_tasks[1] api_task = WorkflowService.spiff_task_to_api_task(task) - self.assertEqual("MutiInstanceTask", task.get_name()) + self.assertEqual("MultiInstanceTask", task.get_name()) task.update_data({"investigator":{"email":"asdf32@virginia.edu"}}) processor.complete_task(task) processor.do_engine_steps() + self.assertEquals(6, len(processor.bpmn_workflow.get_nav_list())) # Completing the tasks out of order, still provides the correct information. expected = self.mock_investigator_response @@ -148,3 +176,4 @@ class TestWorkflowProcessorMultiInstance(BaseTest): task.data['StudyInfo']['investigators']) self.assertEqual(WorkflowStatus.complete, processor.get_status()) + self.assertEquals(6, len(processor.bpmn_workflow.get_nav_list())) diff --git a/tests/test_workflow_service.py b/tests/workflow/test_workflow_service.py similarity index 52% rename from tests/test_workflow_service.py rename to tests/workflow/test_workflow_service.py index 9f3ceda1..6b1b5c58 100644 --- a/tests/test_workflow_service.py +++ b/tests/workflow/test_workflow_service.py @@ -1,7 +1,14 @@ +import json + from tests.base_test import BaseTest from crc.services.workflow_processor import WorkflowProcessor from crc.services.workflow_service import WorkflowService +from SpiffWorkflow import Task as SpiffTask, WorkflowException +from example_data import ExampleDataLoader +from crc import db +from crc.models.stats import TaskEventModel +from crc.models.api_models import Task class TestWorkflowService(BaseTest): @@ -78,4 +85,50 @@ class TestWorkflowService(BaseTest): task = processor.next_task() task_api = WorkflowService.spiff_task_to_api_task(task, add_docs_and_forms=True) WorkflowService.populate_form_with_random_data(task, task_api, required_only=False) - self.assertTrue(isinstance(task.data["sponsor"], dict)) \ No newline at end of file + self.assertTrue(isinstance(task.data["sponsor"], dict)) + + def test_fix_legacy_data_model_for_rrt(self): + ExampleDataLoader().load_rrt() # Make sure the research_rampup is loaded, as it's not a test spec. + workflow = self.create_workflow('research_rampup') + processor = WorkflowProcessor(workflow, validate_only=True) + + # Use the test spec code to complete the workflow of research rampup. + while not processor.bpmn_workflow.is_completed(): + processor.bpmn_workflow.do_engine_steps() + tasks = processor.bpmn_workflow.get_tasks(SpiffTask.READY) + for task in tasks: + task_api = WorkflowService.spiff_task_to_api_task(task, add_docs_and_forms=True) + WorkflowService.populate_form_with_random_data(task, task_api, False) + task.complete() + # create the task events + WorkflowService.log_task_action('dhf8r', workflow, task, + WorkflowService.TASK_ACTION_COMPLETE, + version=processor.get_version_string()) + processor.save() + db.session.commit() + + WorkflowService.fix_legacy_data_model_for_rrt() + + # All tasks should now have data associated with them. + task_logs = db.session.query(TaskEventModel) \ + .filter(TaskEventModel.workflow_id == workflow.id) \ + .filter(TaskEventModel.action == WorkflowService.TASK_ACTION_COMPLETE) \ + .order_by(TaskEventModel.date).all() # Get them back in order. + + self.assertEqual(17, len(task_logs)) + for log in task_logs: + task = processor.bpmn_workflow.get_tasks_from_spec_name(log.task_name)[0] + self.assertIsNotNone(log.form_data) + # Each task should have the data in the form for that task in the task event. + if hasattr(task.task_spec, 'form'): + for field in task.task_spec.form.fields: + if field.has_property(Task.PROP_OPTIONS_REPEAT): + self.assertIn(field.get_property(Task.PROP_OPTIONS_REPEAT), log.form_data) + else: + self.assertIn(field.id, log.form_data) + + # Some spot checks: + # The first task should be empty, with all the data removed. + self.assertEqual({}, task_logs[0].form_data) + + diff --git a/tests/test_workflow_spec_api.py b/tests/workflow/test_workflow_spec_api.py similarity index 100% rename from tests/test_workflow_spec_api.py rename to tests/workflow/test_workflow_spec_api.py diff --git a/tests/test_workflow_spec_validation_api.py b/tests/workflow/test_workflow_spec_validation_api.py similarity index 100% rename from tests/test_workflow_spec_validation_api.py rename to tests/workflow/test_workflow_spec_validation_api.py