diff --git a/app/models/job.py b/app/models/job.py index a0af3ed3d..46498993f 100644 --- a/app/models/job.py +++ b/app/models/job.py @@ -34,7 +34,7 @@ class Job(JSONModel): @property def status(self): - return self.job_status + return self._dict.get('job_status') @property def cancelled(self): diff --git a/tests/conftest.py b/tests/conftest.py index 7140bc66c..9ec007091 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1732,14 +1732,12 @@ def mock_get_uploads(mocker, api_user_active): 'notification_count': 10, 'created_at': '2016-01-01 11:09:00.061258', 'statistics': [{'count': 8, 'status': 'delivered'}, {'count': 2, 'status': 'temporary-failure'}], - 'job_status': 'finished', 'upload_type': 'job'}, {'id': 'job_id_1', 'original_file_name': 'some.csv', 'notification_count': 1, 'created_at': '2016-01-01 11:09:00.061258', 'statistics': [{'count': 1, 'status': 'delivered'}], - 'job_status': 'finished', 'upload_type': 'letter'} ] return {