sartography/cr-connect-workflow
1
0
Fork 0
mirror of https://github.com/sartography/cr-connect-workflow.git synced 2025-02-23 21:28:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for failing tests after removing current_user from task data

Browse Source
This commit is contained in:
mike cullerton 2022-05-31 16:53:15 -04:00
parent f74afc3e18
commit 6911ab7aae
3 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crc/services/study_service.py
View File

@ -135,7 +135,7 @@ class StudyService(object):
files = (File.from_file_model(model, DocumentService.get_dictionary()) for model in files) files = (File.from_file_model(model, DocumentService.get_dictionary()) for model in files)
study.files = list(files) study.files = list(files)
last_time = sincetime("files", last_time) last_time = sincetime("files", last_time)
if process_categories and master_workflow_results: if process_categories and master_workflow_results is not None:
if study.status != StudyStatus.abandoned: if study.status != StudyStatus.abandoned:
workflow_metas = [] workflow_metas = []
for category in study.categories: for category in study.categories:

3
tests/study/test_study_api.py
View File

@ -103,6 +103,7 @@ class TestStudyApi(BaseTest):
self.assertEqual('This workflow is locked', workflows[1].state_message) self.assertEqual('This workflow is locked', workflows[1].state_message)
def test_get_study_has_details_about_files(self): def test_get_study_has_details_about_files(self):
self.load_test_spec('empty_workflow', master_spec=True)
# Set up the study and attach a file to it. # Set up the study and attach a file to it.
self.create_reference_document() self.create_reference_document()
@ -115,7 +116,7 @@ class TestStudyApi(BaseTest):
name="anything.png", content_type="png", name="anything.png", content_type="png",
binary_data=b'1234', irb_doc_code=irb_code) binary_data=b'1234', irb_doc_code=irb_code)
api_response = self.app.get('/v1.0/study/%i' % workflow.study_id, api_response = self.app.get('/v1.0/study/%i?update_status=True' % workflow.study_id,
headers=self.logged_in_headers(), content_type="application/json") headers=self.logged_in_headers(), content_type="application/json")
self.assert_success(api_response) self.assert_success(api_response)
study = StudySchema().loads(api_response.get_data(as_text=True)) study = StudySchema().loads(api_response.get_data(as_text=True))

12
tests/workflow/test_workflow_processor.py
View File

@ -347,18 +347,6 @@ class TestWorkflowProcessor(BaseTest):
supervisor_task = processor.next_user_tasks()[0] supervisor_task = processor.next_user_tasks()[0]
self.assertEqual("supervisor", supervisor_task.task_spec.lane) self.assertEqual("supervisor", supervisor_task.task_spec.lane)
def test_run_master_spec_knows_about_current_user(self):
"""Master spec should have access to the current user."""
spec = self.load_test_spec('empty_workflow', "Master", master_spec=True)
study = self.create_study()
# Make it seem like we are logged in
g.user = UserModel.query.filter_by(uid=study.user_uid).first()
g.token = 'my_fake_token'
results = WorkflowProcessor.run_master_spec(spec, study)
self.assertIn('current_user', results.keys())
def test_ability_to_deserialize_old_workflows(self): def test_ability_to_deserialize_old_workflows(self):
workflow_model = self.create_workflow("random_fact") workflow_model = self.create_workflow("random_fact")
processor = WorkflowProcessor(workflow_model) processor = WorkflowProcessor(workflow_model)