darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-05 06:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into new-api-for-deleting-templates

Browse Source
This commit is contained in:
Martyn Inglis
2016-08-23 09:31:05 +01:00
parent 9d25f326b0 74c0c3e132
commit c44a6cb65d
27 changed files with 351 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/conftest.py
View File

@@ -1068,16 +1068,11 @@ def mock_remove_user_from_service(mocker):
def mock_get_template_statistics(mocker, service_one, fake_uuid):
template = template_json(service_one['id'], fake_uuid, "Test template", "sms", "Something very interesting")
data = {
"usage_count": 1,
"template": {
"name": template['name'],
"template_type": template['template_type'],
"id": template['id']
},
"service": template['service'],
"id": str(generate_uuid()),
"day": "2016-04-04",
"updated_at": "2016-04-04T12:00:00.000000+00:00"
"count": 1,
"template_name": template['name'],
"template_type": template['template_type'],
"template_id": template['id'],
"day": "2016-04-04"
}
def _get_stats(service_id, limit_days=None):