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

use new detailed service endpoint for dashboard totals

Browse Source 
we don't want to use the old statistics endpoints any more
also a couple of quality of life changes
* moves some logic out of the _totals.html template
* tidies up statistics_utils
This commit is contained in:
Leo Hemsted
2016-07-19 17:10:48 +01:00
parent 4451a8634d
commit 3e6eedd079
5 changed files with 49 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/__init__.py
View File

@@ -13,11 +13,11 @@ class TestClient(FlaskClient):
session['user_id'] = user.id
session['_fresh'] = True
if mocker:
mocker.patch('app.user_api_client.get_user', return_value=user)
mocker.patch('app.events_api_client.create_event')
if mocker and service:
session['service_id'] = service['id']
mocker.patch('app.service_api_client.get_service', return_value={'data': service})
get_user_mock = mocker.patch('app.user_api_client.get_user', return_value=user)
create_event_mock = mocker.patch('app.events_api_client.create_event')
if service:
session['service_id'] = service['id']
get_service_mock = mocker.patch('app.service_api_client.get_service', return_value={'data': service})
login_user(user, remember=True)
def login_fresh(self):

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

@@ -417,18 +417,19 @@ def test_aggregate_template_stats():
assert item['usage_count'] == 206
def test_service_dashboard_updates_gets_detailed_service(mocker,
def test_service_dashboard_updates_gets_dashboard_totals(mocker,
app_,
active_user_with_permissions,
service_one,
mock_get_service,
mock_get_service_statistics,
mock_get_usage,
):
mock_get_usage):
dashboard_totals = mocker.patch('app.main.views.dashboard.get_dashboard_totals', return_value={
'email': {'requested': 0, 'delivered': 0, 'failed': 0},
'sms': {'requested': 0, 'delivered': 0, 'failed': 0}
})
with app_.test_request_context(), app_.test_client() as client:
client.login(active_user_with_permissions, mocker, service_one)
response = client.get(url_for('main.service_dashboard', service_id=SERVICE_ONE_ID))
assert response.status_code == 200
# mock_get_service_statistics.assert_not_called()
# mock_get_service.assert_called_once_with(service_one.id, detailed=True)