darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-06 11:23:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update json structure for unit tests.

Browse Source
This commit is contained in:
Rebecca Law
2016-05-16 11:53:22 +01:00
parent fcf277c413
commit d4225de45e
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/views/jobs.py
View File

@@ -57,7 +57,9 @@ def view_jobs(service_id):
@user_has_permissions('view_activity', admin_override=True)
def view_job(service_id, job_id):
job = job_api_client.get_job(service_id, job_id)['data']
template = service_api_client.get_service_template(service_id, job['template'], job['template_version'])['data']
template = service_api_client.get_service_template(service_id=service_id,
template_id=job['template'],
version=job['template_version'])['data']
notifications = notification_api_client.get_notifications_for_service(service_id, job_id)
finished = job['status'] == 'finished'
return render_template(

10
tests/__init__.py
View File

@@ -53,14 +53,14 @@ def template_json(service_id,
type_="sms",
content="template content",
subject=None,
versions=['1']):
versions='1'):
template = {
'id': id_,
'name': name,
'template_type': type_,
'content': content,
'service': service_id,
'versions': versions
'version': versions
}
if subject is not None:
template['subject'] = subject
@@ -83,7 +83,6 @@ def template_version_json(service_id,
created_at = datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S.%f')
template['created_at'] = created_at
template['version'] = version
del template['versions']
return template
@@ -129,6 +128,7 @@ def job_json():
'id': job_id,
'service': 1,
'template': 1,
'template_version': 1,
'original_file_name': 'thisisatest.csv',
'created_at': created_at,
'notification_count': 1,
@@ -143,6 +143,7 @@ def job_json_with_created_by(service_id=None, job_id=None):
'id': job_id if job_id else str(generate_uuid()),
'service': service_id if service_id else str(generate_uuid()),
'template': 1,
'template_version': 1,
'original_file_name': 'thisisatest.csv',
'created_at': str(datetime.now().time()),
'notification_count': 1,
@@ -190,7 +191,8 @@ def notification_json(service_id,
'sent_at': sent_at,
'status': status,
'created_at': created_at,
'updated_at': updated_at
'updated_at': updated_at,
'template_version': template['version']
} for i in range(5)],
'total': 5,
'page_size': 50,

4
tests/conftest.py
View File

@@ -203,9 +203,11 @@ def mock_get_aggregate_service_statistics(mocker):
@pytest.fixture(scope='function')
def mock_get_service_template(mocker):
def _get(service_id, template_id):
def _get(service_id, template_id, version=None):
template = template_json(
service_id, template_id, "Two week reminder", "sms", "Your vehicle tax is about to expire")
if version:
template.update({'version': version})
return {'data': template}
return mocker.patch(