Merge with new master.

This commit is contained in:
Nicholas Staples
2016-03-18 10:16:14 +00:00
33 changed files with 606 additions and 66 deletions

View File

@@ -24,7 +24,7 @@ from notifications_python_client.errors import HTTPError
@pytest.fixture(scope='session')
def app_(request):
app = create_app('test')
app = create_app()
ctx = app.app_context()
ctx.push()
@@ -154,6 +154,15 @@ def mock_delete_service(mocker, mock_get_service):
'app.notifications_api_client.delete_service', side_effect=_delete)
@pytest.fixture(scope='function')
def mock_get_service_statistics(mocker):
def _create(service_id):
return {'data': [{}]}
return mocker.patch(
'app.statistics_api_client.get_statistics_for_service', side_effect=_create)
@pytest.fixture(scope='function')
def mock_get_service_template(mocker):
def _create(service_id, template_id):