darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-11 09:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #568 from alphagov/template_history_view

Browse Source 
Template history view
This commit is contained in:
Rebecca Law
2016-05-17 08:50:40 +01:00
parent ed74280044 d4225de45e
commit c4de547b74
13 changed files with 296 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
tests/__init__.py
View File

@@ -1,6 +1,6 @@
import pytest
import uuid
import datetime
from datetime import datetime, timedelta
from flask.testing import FlaskClient
from flask import url_for
from flask_login import login_user
@@ -53,19 +53,40 @@ def template_json(service_id,
name="sample template",
type_="sms",
content="template content",
subject=None):
subject=None,
versions='1'):
template = {
'id': id_,
'name': name,
'template_type': type_,
'content': content,
'service': service_id
'service': service_id,
'version': versions
}
if subject is not None:
template['subject'] = subject
return template
def template_version_json(service_id,
id_,
created_by,
version=1,
created_at=None,
**kwargs):
template = template_json(service_id, id_, **kwargs)
template['created_by'] = {
'id': created_by.id,
'name': created_by.name,
'email_address': created_by.email_address
}
if created_at is None:
created_at = datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S.%f')
template['created_at'] = created_at
template['version'] = version
return template
def api_key_json(id_, name, expiry_date=None):
return {'id': id_,
'name': name,
@@ -103,11 +124,12 @@ def create_test_api_user(state, permissions={}):
def job_json():
job_id = str(generate_uuid())
created_at = str(datetime.datetime.utcnow().time())
created_at = str(datetime.utcnow().time())
data = {
'id': job_id,
'service': 1,
'template': 1,
'template_version': 1,
'original_file_name': 'thisisatest.csv',
'created_at': created_at,
'notification_count': 1,
@@ -122,8 +144,9 @@ 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.datetime.now().time()),
'created_at': str(datetime.now().time()),
'notification_count': 1,
'notifications_sent': 1,
'status': '',
@@ -146,11 +169,11 @@ def notification_json(service_id,
if template is None:
template = template_json(service_id, str(generate_uuid()))
if sent_at is None:
sent_at = str(datetime.datetime.utcnow().time())
sent_at = str(datetime.utcnow().time())
if created_at is None:
created_at = str(datetime.datetime.utcnow().time())
created_at = str(datetime.utcnow().time())
if updated_at is None:
updated_at = str((datetime.datetime.utcnow() + datetime.timedelta(minutes=1)).time())
updated_at = str((datetime.utcnow() + timedelta(minutes=1)).time())
links = {}
if with_links:
links = {
@@ -169,7 +192,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,