darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 23:55:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added functionality to archive a template.

Browse Source 
Renamed migration file.
This commit is contained in:
Nicholas Staples
2016-04-25 16:28:08 +01:00
parent 74c3746d23
commit e6cc3b1724
7 changed files with 111 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/app/conftest.py
View File

@@ -44,21 +44,18 @@ def sample_user(notify_db,
notify_db_session,
mobile_numnber="+447700900986",
email="notify@digital.cabinet-office.gov.uk"):
try:
data = {
'name': 'Test User',
'email_address': email,
'password': 'password',
'mobile_number': mobile_numnber,
'state': 'active'
}
usr = User.query.filter_by(email_address=email).first()
if not usr:
usr = User(**data)
save_model_user(usr)
except Exception:
import traceback
traceback.print_exc()
data = {
'name': 'Test User',
'email_address': email,
'password': 'password',
'mobile_number': mobile_numnber,
'state': 'active'
}
usr = User.query.filter_by(email_address=email).first()
if not usr:
usr = User(**data)
save_model_user(usr)
return usr
@@ -134,20 +131,24 @@ def sample_template(notify_db,
template_name="Template Name",
template_type="sms",
content="This is a template",
archived=False,
subject_line='Subject',
user=None,
service=None):
service=None,
created_by=None):
if user is None:
user = sample_user(notify_db, notify_db_session)
if service is None:
service = sample_service(notify_db, notify_db_session)
sample_api_key(notify_db, notify_db_session, service=service)
if created_by is None:
created_by = sample_user(notify_db, notify_db_session)
data = {
'name': template_name,
'template_type': template_type,
'content': content,
'service': service,
'created_by': user
'created_by': created_by,
'archived': archived
}
if template_type == 'email':
data.update({
@@ -177,7 +178,6 @@ def sample_email_template(
user = sample_user(notify_db, notify_db_session)
if service is None:
service = sample_service(notify_db, notify_db_session)
sample_api_key(notify_db, notify_db_session, service=service)
data = {
'name': template_name,
'template_type': template_type,