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

Merge pull request #524 from alphagov/usage

Browse Source 
Add usage to the dashboard
This commit is contained in:
Chris Hill-Scott
2016-05-03 11:35:11 +01:00
parent 9e94d2382d 00030bc254
commit 1d0b28f156
14 changed files with 197 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/app/main/views/test_dashboard.py
View File

@@ -65,7 +65,8 @@ def test_should_show_recent_templates_on_dashboard(app_,
mock_get_user_by_email,
mock_login,
mock_get_jobs,
mock_has_permissions):
mock_has_permissions,
mock_get_usage):
mock_template_stats = mocker.patch('app.template_statistics_client.get_template_statistics_for_service',
return_value=copy.deepcopy(stub_template_stats))
@@ -164,7 +165,8 @@ def test_menu_send_messages(mocker,
service_one,
mock_get_service_templates,
mock_get_jobs,
mock_get_template_statistics):
mock_get_template_statistics,
mock_get_usage):
with app_.test_request_context():
resp = _test_dashboard_menu(
@@ -197,7 +199,8 @@ def test_menu_manage_service(mocker,
service_one,
mock_get_service_templates,
mock_get_jobs,
mock_get_template_statistics):
mock_get_template_statistics,
mock_get_usage):
with app_.test_request_context():
resp = _test_dashboard_menu(
mocker,
@@ -229,7 +232,8 @@ def test_menu_manage_api_keys(mocker,
service_one,
mock_get_service_templates,
mock_get_jobs,
mock_get_template_statistics):
mock_get_template_statistics,
mock_get_usage):
with app_.test_request_context():
resp = _test_dashboard_menu(
mocker,
@@ -260,7 +264,8 @@ def test_menu_all_services_for_platform_admin_user(mocker,
service_one,
mock_get_service_templates,
mock_get_jobs,
mock_get_template_statistics):
mock_get_template_statistics,
mock_get_usage):
with app_.test_request_context():
resp = _test_dashboard_menu(
mocker,
@@ -295,7 +300,8 @@ def test_route_for_service_permissions(mocker,
mock_get_service_templates,
mock_get_jobs,
mock_get_service_statistics,
mock_get_template_statistics):
mock_get_template_statistics,
mock_get_usage):
routes = [
'main.service_dashboard']
with app_.test_request_context():

3
tests/app/main/views/test_sign_out.py
View File

@@ -20,7 +20,8 @@ def test_sign_out_user(app_,
mock_get_service_statistics,
mock_get_jobs,
mock_has_permissions,
mock_get_template_statistics):
mock_get_template_statistics,
mock_get_usage):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)

13
tests/conftest.py
View File

@@ -898,6 +898,19 @@ def mock_get_template_statistics(mocker, service_one, fake_uuid):
'app.template_statistics_client.get_template_statistics_for_service', side_effect=_get_stats)
@pytest.fixture(scope='function')
def mock_get_usage(mocker, service_one, fake_uuid):
def _get_usage(service_id):
return {'data': {
"sms_count": 123,
"email_count": 456
}}
return mocker.patch(
'app.service_api_client.get_service_usage', side_effect=_get_usage)
@pytest.fixture(scope='function')
def mock_events(mocker):