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

Update all dates to use utc, only in the template is it converted to british time.

Browse Source 
Template versions and template version pages added.

Fix merge changes.
This commit is contained in:
Nicholas Staples
2016-05-11 11:20:45 +01:00
committed by Chris Hill-Scott
parent daf33b03ad
commit 64e7a7b010
12 changed files with 283 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
tests/conftest.py
View File

@@ -9,6 +9,7 @@ from . import (
service_json,
TestClient,
template_json,
template_version_json,
api_key_json,
job_json,
notification_json,
@@ -208,7 +209,47 @@ def mock_get_service_template(mocker):
return {'data': template}
return mocker.patch(
'app.service_api_client.get_service_template', side_effect=_get)
'app.service_api_client.get_service_template',
side_effect=_get
)
@pytest.fixture(scope='function')
def mock_get_template_version(mocker, fake_uuid, user=None):
if user is None:
user = api_user_active(fake_uuid)
def _get(service_id, template_id, version):
template_version = template_version_json(
service_id,
template_id,
user,
version=version
)
return {'data': template_version}
return mocker.patch(
'app.service_api_client.get_service_template',
side_effect=_get
)
@pytest.fixture(scope='function')
def mock_get_template_versions(mocker, fake_uuid, user=None):
if user is None:
user = api_user_active(fake_uuid)
def _get(service_id, template_id):
template_version = template_version_json(
service_id,
template_id,
user,
version=1
)
return {'data': [template_version]}
return mocker.patch(
'app.service_api_client.get_service_template_versions',
side_effect=_get
)
@pytest.fixture(scope='function')
@@ -220,7 +261,9 @@ def mock_get_service_template_with_placeholders(mocker):
return {'data': template}
return mocker.patch(
'app.service_api_client.get_service_template', side_effect=_get)
'app.service_api_client.get_service_template',
side_effect=_get
)
@pytest.fixture(scope='function')