darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-06 15:18:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into scheduled-delivery-of-jobs-cleanup

Browse Source 
Conflicts:
	tests/app/job/test_rest.py
This commit is contained in:
Rebecca Law
2016-09-02 11:03:21 +01:00
parent 489f95c8cd aa8ee3a8da
commit 8f3e8181fe
18 changed files with 172 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/app/job/test_rest.py
View File

@@ -139,6 +139,7 @@ def test_create_unscheduled_job(notify_api, sample_template, mocker, fake_uuid):
resp_json = json.loads(response.get_data(as_text=True))
assert resp_json['data']['id'] == fake_uuid
assert resp_json['data']['statistics'] == []
assert resp_json['data']['job_status'] == 'pending'
assert not resp_json['data']['scheduled_for']
assert resp_json['data']['job_status'] == 'pending'
@@ -176,9 +177,10 @@ def test_create_scheduled_job(notify_api, sample_template, mocker, fake_uuid):
resp_json = json.loads(response.get_data(as_text=True))
assert resp_json['data']['id'] == fake_uuid
assert resp_json['data']['job_status'] == 'scheduled'
assert resp_json['data']['status'] == 'pending'
assert resp_json['data']['scheduled_for'] == datetime(2016, 1, 2, 11, 59, 0,
tzinfo=pytz.UTC).isoformat()
assert resp_json['data']['job_status'] == 'scheduled'
assert resp_json['data']['template'] == str(sample_template.id)
assert resp_json['data']['original_file_name'] == 'thisisatest.csv'