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

Merge remote-tracking branch 'origin/master' into add_send_permission

Browse Source
This commit is contained in:
Nicholas Staples
2016-03-03 09:20:19 +00:00
parent 1b59e5c7f1 332d018d7c
commit 9b31761001
20 changed files with 352 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/conftest.py
View File

@@ -141,6 +141,17 @@ def mock_get_service_template(mocker):
'app.notifications_api_client.get_service_template', side_effect=_create)
@pytest.fixture(scope='function')
def mock_get_service_email_template(mocker):
def _create(service_id, template_id):
template = template_json(
template_id, "Two week reminder", "email", "Your vehicle tax is about to expire", service_id)
return {'data': template}
return mocker.patch(
'app.notifications_api_client.get_service_template', side_effect=_create)
@pytest.fixture(scope='function')
def mock_create_service_template(mocker):
def _create(name, type_, content, service):
@@ -570,7 +581,7 @@ def sample_invite(mocker, service_one):
email_address = 'invited_user@test.gov.uk'
service_id = service_one['id']
permissions = 'send_messages,manage_service,manage_api_keys'
created_at = datetime.datetime.now()
created_at = str(datetime.datetime.now())
return invite_json(id, from_user, service_id, email_address, permissions, created_at)