FileModelSchema requires irb_doc_code now, so we can't use it here

tests/files/test_files_api.py

@@ -42,9 +42,8 @@ class TestFilesApi(BaseTest):
         self.assert_success(rv)
         self.assertIsNotNone(rv.get_data())
         json_data = json.loads(rv.get_data(as_text=True))
-        file = FileModelSchema().load(json_data, session=session)
-        self.assertEqual(FileType.xlsx, file.type)
-        self.assertEqual("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", file.content_type)
+        self.assertEqual(FileType.xlsx.value, json_data['type'])
+        self.assertEqual("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", json_data['content_type'])
         # self.assertEqual('dhf8r', json_data['user_uid'])
 
     def test_set_reference_file_bad_extension(self):
@@ -88,8 +87,7 @@ class TestFilesApi(BaseTest):
                            content_type='multipart/form-data', headers=self.logged_in_headers())
         self.assertIsNotNone(rv.get_data())
         json_data = json.loads(rv.get_data(as_text=True))
-        file = FileModelSchema().load(json_data, session=session)
-        self.assertEqual(FileType.xlsx, file.type)
+        self.assertEqual(FileType.xlsx.value, json_data['type'])
 
     def test_delete_reference_file(self):
         ExampleDataLoader().load_reference_documents()
@@ -120,8 +118,7 @@ class TestFilesApi(BaseTest):
         self.assert_success(rv)
         json_data = json.loads(rv.get_data(as_text=True))
         self.assertEqual(1, len(json_data))
-        file = FileModelSchema(many=True).load(json_data, session=session)
-        self.assertEqual(file_name, file[0].name)
+        self.assertEqual(file_name, json_data[0]['name'])
 
     def create_user_file(self):
         self.create_reference_document()

tests/files/test_spec_files_api.py

@@ -4,7 +4,7 @@ import json
 from tests.base_test import BaseTest
 
 from crc import session
-from crc.models.file import FileType, FileModelSchema
+from crc.models.file import FileType, FileModelSchema, FileSchema
 from crc.services.spec_file_service import SpecFileService
 
 
@@ -19,8 +19,7 @@ class TestFilesApi(BaseTest):
         self.assert_success(rv)
         json_data = json.loads(rv.get_data(as_text=True))
         self.assertEqual(2, len(json_data))
-        files = FileModelSchema(many=True).load(json_data, session=session)
-        file_names = [f.name for f in files]
+        file_names = [f['name'] for f in json_data]
         self.assertTrue("%s.bpmn" % spec.id in file_names)
 
     def test_list_multiple_files_for_workflow_spec(self):
@@ -122,8 +121,6 @@ class TestFilesApi(BaseTest):
                            content_type='multipart/form-data', headers=self.logged_in_headers())
         self.assert_success(rv)
         self.assertIsNotNone(rv.get_data())
-        json_data = json.loads(rv.get_data(as_text=True))
-        file = FileModelSchema().load(json_data, session=session)
 
         # get that mf.
         rv = self.app.get(f'/v1.0/workflow-specification/{spec.id}/file/random_fact.bpmn',

tests/test_tasks_api.py

@@ -138,7 +138,6 @@ class TestTasksApi(BaseTest):
         self.assertEqual("Task 3", nav[4].description)
         self.assertEqual("EndEvent", nav[5].spec_type)
 
-
     def test_document_added_to_workflow_shows_up_in_file_list(self):
         self.create_reference_document()
         workflow = self.create_workflow('docx')
@@ -159,8 +158,7 @@ class TestTasksApi(BaseTest):
         rv = self.app.get('/v1.0/file?workflow_id=%i' % workflow.id, headers=self.logged_in_headers())
         self.assert_success(rv)
         json_data = json.loads(rv.get_data(as_text=True))
-        files = FileModelSchema(many=True).load(json_data, session=session)
-        self.assertTrue(len(files) == 1)
+        self.assertTrue(len(json_data) == 1)
 
         # Assure we can still delete the study even when there is a file attached to a workflow.
         rv = self.app.delete('/v1.0/study/%i' % workflow.study_id, headers=self.logged_in_headers())