2018-02-20 11:22:17 +00:00
|
|
|
|
import copy
|
2017-07-07 15:51:59 +01:00
|
|
|
|
import json
|
2018-02-20 11:22:17 +00:00
|
|
|
|
from datetime import datetime
|
2017-02-16 15:08:16 +00:00
|
|
|
|
from functools import partial
|
2018-07-20 10:18:51 +01:00
|
|
|
|
from unittest.mock import call
|
2016-04-05 11:40:13 +01:00
|
|
|
|
|
2016-07-20 14:12:03 +01:00
|
|
|
|
import pytest
|
2016-04-06 15:06:02 +01:00
|
|
|
|
from bs4 import BeautifulSoup
|
2018-02-20 11:22:17 +00:00
|
|
|
|
from flask import url_for
|
2016-06-19 09:04:21 +01:00
|
|
|
|
from freezegun import freeze_time
|
2018-04-25 14:12:58 +01:00
|
|
|
|
|
|
|
|
|
|
from app.main.views.dashboard import (
|
2019-01-16 10:54:52 +00:00
|
|
|
|
aggregate_notifications_stats,
|
2018-04-25 14:12:58 +01:00
|
|
|
|
aggregate_status_types,
|
2019-01-16 10:54:52 +00:00
|
|
|
|
aggregate_template_usage,
|
2018-04-25 14:12:58 +01:00
|
|
|
|
format_monthly_stats_to_list,
|
|
|
|
|
|
format_template_stats_to_list,
|
|
|
|
|
|
get_dashboard_totals,
|
|
|
|
|
|
get_free_paid_breakdown_for_billable_units,
|
|
|
|
|
|
get_tuples_of_financial_years,
|
|
|
|
|
|
)
|
2018-02-20 11:22:17 +00:00
|
|
|
|
from tests import (
|
|
|
|
|
|
validate_route_permission,
|
|
|
|
|
|
validate_route_permission_with_client,
|
2016-09-29 18:44:10 +01:00
|
|
|
|
)
|
2017-05-22 17:02:03 +01:00
|
|
|
|
from tests.conftest import (
|
|
|
|
|
|
SERVICE_ONE_ID,
|
2018-06-14 11:39:06 +01:00
|
|
|
|
active_caseworking_user,
|
|
|
|
|
|
active_user_view_permissions,
|
2017-05-22 17:02:03 +01:00
|
|
|
|
mock_get_inbound_sms_summary,
|
|
|
|
|
|
mock_get_inbound_sms_summary_with_no_messages,
|
2017-07-04 13:38:08 +01:00
|
|
|
|
normalize_spaces,
|
2017-05-22 17:02:03 +01:00
|
|
|
|
)
|
2015-12-18 10:26:56 +00:00
|
|
|
|
|
2016-04-06 15:48:04 +01:00
|
|
|
|
stub_template_stats = [
|
|
|
|
|
|
{
|
2016-08-18 15:30:57 +01:00
|
|
|
|
'template_type': 'sms',
|
|
|
|
|
|
'template_name': 'one',
|
|
|
|
|
|
'template_id': 'id-1',
|
2019-01-15 16:44:37 +00:00
|
|
|
|
'status': 'created',
|
|
|
|
|
|
'count': 50,
|
2019-01-15 16:19:23 +00:00
|
|
|
|
'is_precompiled_letter': False
|
2016-08-18 15:30:57 +01:00
|
|
|
|
},
|
2016-04-06 15:48:04 +01:00
|
|
|
|
{
|
2016-08-18 15:30:57 +01:00
|
|
|
|
'template_type': 'email',
|
|
|
|
|
|
'template_name': 'two',
|
|
|
|
|
|
'template_id': 'id-2',
|
2019-01-15 16:44:37 +00:00
|
|
|
|
'status': 'created',
|
2019-01-16 10:54:52 +00:00
|
|
|
|
'count': 100,
|
|
|
|
|
|
'is_precompiled_letter': False
|
|
|
|
|
|
},
|
|
|
|
|
|
{
|
|
|
|
|
|
'template_type': 'email',
|
|
|
|
|
|
'template_name': 'two',
|
|
|
|
|
|
'template_id': 'id-2',
|
|
|
|
|
|
'status': 'technical-failure',
|
|
|
|
|
|
'count': 100,
|
2019-01-15 16:19:23 +00:00
|
|
|
|
'is_precompiled_letter': False
|
2018-03-05 21:54:54 +00:00
|
|
|
|
},
|
|
|
|
|
|
{
|
|
|
|
|
|
'template_type': 'letter',
|
|
|
|
|
|
'template_name': 'three',
|
|
|
|
|
|
'template_id': 'id-3',
|
2019-01-15 16:44:37 +00:00
|
|
|
|
'status': 'delivered',
|
2019-01-15 16:19:23 +00:00
|
|
|
|
'count': 300,
|
|
|
|
|
|
'is_precompiled_letter': False
|
2018-03-05 21:54:54 +00:00
|
|
|
|
},
|
2019-01-15 16:44:37 +00:00
|
|
|
|
{
|
|
|
|
|
|
'template_type': 'sms',
|
|
|
|
|
|
'template_name': 'one',
|
|
|
|
|
|
'template_id': 'id-1',
|
|
|
|
|
|
'status': 'delivered',
|
|
|
|
|
|
'count': 50,
|
|
|
|
|
|
'is_precompiled_letter': False
|
|
|
|
|
|
},
|
2018-03-05 21:54:54 +00:00
|
|
|
|
{
|
|
|
|
|
|
'template_type': 'letter',
|
|
|
|
|
|
'template_name': 'four',
|
|
|
|
|
|
'template_id': 'id-4',
|
2019-01-15 16:44:37 +00:00
|
|
|
|
'status': 'delivered',
|
2018-03-05 21:54:54 +00:00
|
|
|
|
'count': 400,
|
|
|
|
|
|
'is_precompiled_letter': True
|
2019-01-15 16:44:37 +00:00
|
|
|
|
},
|
|
|
|
|
|
{
|
|
|
|
|
|
'template_type': 'letter',
|
|
|
|
|
|
'template_name': 'four',
|
|
|
|
|
|
'template_id': 'id-4',
|
|
|
|
|
|
'status': 'cancelled',
|
|
|
|
|
|
'count': 5,
|
|
|
|
|
|
'is_precompiled_letter': True
|
|
|
|
|
|
},
|
|
|
|
|
|
{
|
|
|
|
|
|
'template_type': 'letter',
|
|
|
|
|
|
'template_name': 'thirty-three',
|
|
|
|
|
|
'template_id': 'id-33',
|
|
|
|
|
|
'status': 'cancelled',
|
|
|
|
|
|
'count': 5,
|
|
|
|
|
|
'is_precompiled_letter': False
|
|
|
|
|
|
},
|
2016-04-06 15:48:04 +01:00
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
|
|
|
2018-06-14 11:39:06 +01:00
|
|
|
|
@pytest.mark.parametrize('user', (
|
|
|
|
|
|
active_user_view_permissions,
|
|
|
|
|
|
active_caseworking_user,
|
|
|
|
|
|
))
|
2018-02-14 10:38:00 +00:00
|
|
|
|
def test_redirect_from_old_dashboard(
|
2018-06-14 11:39:06 +01:00
|
|
|
|
logged_in_client,
|
|
|
|
|
|
user,
|
|
|
|
|
|
mocker,
|
|
|
|
|
|
fake_uuid,
|
2018-02-14 10:38:00 +00:00
|
|
|
|
):
|
2018-06-14 11:39:06 +01:00
|
|
|
|
mocker.patch('app.user_api_client.get_user', return_value=user(fake_uuid))
|
2018-02-14 10:38:00 +00:00
|
|
|
|
expected_location = 'http://localhost/services/{}'.format(SERVICE_ONE_ID)
|
|
|
|
|
|
|
|
|
|
|
|
response = logged_in_client.get('/services/{}/dashboard'.format(SERVICE_ONE_ID))
|
|
|
|
|
|
|
|
|
|
|
|
assert response.status_code == 302
|
|
|
|
|
|
assert response.location == expected_location
|
|
|
|
|
|
assert expected_location == url_for('main.service_dashboard', service_id=SERVICE_ONE_ID, _external=True)
|
|
|
|
|
|
|
|
|
|
|
|
|
2018-06-14 11:39:06 +01:00
|
|
|
|
def test_redirect_caseworkers_to_templates(
|
|
|
|
|
|
client_request,
|
|
|
|
|
|
mocker,
|
|
|
|
|
|
active_caseworking_user,
|
|
|
|
|
|
):
|
|
|
|
|
|
mocker.patch('app.user_api_client.get_user', return_value=active_caseworking_user)
|
|
|
|
|
|
client_request.get(
|
|
|
|
|
|
'main.service_dashboard',
|
|
|
|
|
|
service_id=SERVICE_ONE_ID,
|
|
|
|
|
|
_expected_status=302,
|
|
|
|
|
|
_expected_redirect=url_for(
|
|
|
|
|
|
'main.choose_template',
|
|
|
|
|
|
service_id=SERVICE_ONE_ID,
|
|
|
|
|
|
_external=True,
|
|
|
|
|
|
)
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
2016-07-04 13:04:25 +01:00
|
|
|
|
def test_get_started(
|
2017-02-03 12:07:21 +00:00
|
|
|
|
logged_in_client,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
mocker,
|
|
|
|
|
|
mock_get_service_templates_when_no_templates_exist,
|
|
|
|
|
|
mock_get_jobs,
|
2018-05-09 13:53:02 +01:00
|
|
|
|
mock_get_service_statistics,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
mock_get_usage,
|
2017-08-23 17:07:42 +01:00
|
|
|
|
mock_get_inbound_sms_summary
|
2016-07-04 13:04:25 +01:00
|
|
|
|
):
|
2017-10-18 14:51:26 +01:00
|
|
|
|
mocker.patch(
|
|
|
|
|
|
'app.template_statistics_client.get_template_statistics_for_service',
|
|
|
|
|
|
return_value=copy.deepcopy(stub_template_stats)
|
|
|
|
|
|
)
|
2016-07-04 13:04:25 +01:00
|
|
|
|
|
2017-02-03 12:07:21 +00:00
|
|
|
|
response = logged_in_client.get(url_for('main.service_dashboard', service_id=SERVICE_ONE_ID))
|
2016-07-04 13:04:25 +01:00
|
|
|
|
|
|
|
|
|
|
# mock_get_service_templates_when_no_templates_exist.assert_called_once_with(SERVICE_ONE_ID)
|
|
|
|
|
|
assert response.status_code == 200
|
|
|
|
|
|
assert 'Get started' in response.get_data(as_text=True)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_get_started_is_hidden_once_templates_exist(
|
2017-02-03 12:07:21 +00:00
|
|
|
|
logged_in_client,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
mocker,
|
|
|
|
|
|
mock_get_service_templates,
|
|
|
|
|
|
mock_get_jobs,
|
2018-05-09 13:53:02 +01:00
|
|
|
|
mock_get_service_statistics,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
mock_get_usage,
|
2017-08-23 17:07:42 +01:00
|
|
|
|
mock_get_inbound_sms_summary
|
2016-07-04 13:04:25 +01:00
|
|
|
|
):
|
2017-10-18 14:51:26 +01:00
|
|
|
|
mocker.patch(
|
|
|
|
|
|
'app.template_statistics_client.get_template_statistics_for_service',
|
|
|
|
|
|
return_value=copy.deepcopy(stub_template_stats)
|
|
|
|
|
|
)
|
2017-02-03 12:07:21 +00:00
|
|
|
|
response = logged_in_client.get(url_for('main.service_dashboard', service_id=SERVICE_ONE_ID))
|
2016-07-04 13:04:25 +01:00
|
|
|
|
|
|
|
|
|
|
# mock_get_service_templates.assert_called_once_with(SERVICE_ONE_ID)
|
|
|
|
|
|
assert response.status_code == 200
|
|
|
|
|
|
assert 'Get started' not in response.get_data(as_text=True)
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-06-05 14:48:24 +01:00
|
|
|
|
def test_inbound_messages_not_visible_to_service_without_permissions(
|
|
|
|
|
|
logged_in_client,
|
|
|
|
|
|
service_one,
|
|
|
|
|
|
mock_get_service_templates_when_no_templates_exist,
|
|
|
|
|
|
mock_get_jobs,
|
2018-05-09 13:53:02 +01:00
|
|
|
|
mock_get_service_statistics,
|
2017-06-05 14:48:24 +01:00
|
|
|
|
mock_get_template_statistics,
|
|
|
|
|
|
mock_get_usage,
|
2017-08-23 17:07:42 +01:00
|
|
|
|
mock_get_inbound_sms_summary
|
2017-06-05 14:48:24 +01:00
|
|
|
|
):
|
|
|
|
|
|
|
|
|
|
|
|
service_one['permissions'] = []
|
|
|
|
|
|
|
|
|
|
|
|
response = logged_in_client.get(url_for('main.service_dashboard', service_id=SERVICE_ONE_ID))
|
|
|
|
|
|
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
|
|
|
|
|
|
|
|
|
|
|
assert response.status_code == 200
|
|
|
|
|
|
assert not page.select('.big-number-meta-wrapper')
|
|
|
|
|
|
assert mock_get_inbound_sms_summary.called is False
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-05-22 17:02:03 +01:00
|
|
|
|
@pytest.mark.parametrize('inbound_summary_mock, expected_text', [
|
|
|
|
|
|
(mock_get_inbound_sms_summary_with_no_messages, '0 text messages received'),
|
|
|
|
|
|
(mock_get_inbound_sms_summary, '99 text messages received latest message just now'),
|
|
|
|
|
|
])
|
|
|
|
|
|
def test_inbound_messages_shows_count_of_messages(
|
|
|
|
|
|
logged_in_client,
|
|
|
|
|
|
mocker,
|
2017-06-05 14:48:24 +01:00
|
|
|
|
service_one,
|
2017-05-22 17:02:03 +01:00
|
|
|
|
mock_get_service_templates_when_no_templates_exist,
|
|
|
|
|
|
mock_get_jobs,
|
2018-05-09 13:53:02 +01:00
|
|
|
|
mock_get_service_statistics,
|
2017-05-22 17:02:03 +01:00
|
|
|
|
mock_get_template_statistics,
|
|
|
|
|
|
mock_get_usage,
|
|
|
|
|
|
inbound_summary_mock,
|
2017-08-23 17:07:42 +01:00
|
|
|
|
expected_text
|
2017-05-22 17:02:03 +01:00
|
|
|
|
):
|
|
|
|
|
|
|
2017-06-05 14:48:24 +01:00
|
|
|
|
service_one['permissions'] = ['inbound_sms']
|
2017-05-22 17:02:03 +01:00
|
|
|
|
inbound_summary_mock(mocker)
|
|
|
|
|
|
|
|
|
|
|
|
response = logged_in_client.get(url_for('main.service_dashboard', service_id=SERVICE_ONE_ID))
|
|
|
|
|
|
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
|
|
|
|
|
|
|
|
|
|
|
assert response.status_code == 200
|
|
|
|
|
|
assert normalize_spaces(page.select('.big-number-meta-wrapper')[0].text) == expected_text
|
|
|
|
|
|
assert page.select('.big-number-meta-wrapper a')[0]['href'] == url_for(
|
|
|
|
|
|
'main.inbox', service_id=SERVICE_ONE_ID
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.parametrize('index, expected_row', enumerate([
|
2017-06-06 12:57:55 +01:00
|
|
|
|
'07900 900000 message-1 1 hour ago',
|
2018-04-04 15:39:50 +01:00
|
|
|
|
'07900 900000 message-2 1 hour ago',
|
|
|
|
|
|
'07900 900000 message-3 1 hour ago',
|
2017-06-06 12:57:55 +01:00
|
|
|
|
'07900 900002 message-4 3 hours ago',
|
|
|
|
|
|
'07900 900004 message-5 5 hours ago',
|
|
|
|
|
|
'07900 900006 message-6 7 hours ago',
|
|
|
|
|
|
'07900 900008 message-7 9 hours ago',
|
2018-04-04 15:39:50 +01:00
|
|
|
|
'07900 900008 message-8 9 hours ago',
|
2017-05-22 17:02:03 +01:00
|
|
|
|
]))
|
|
|
|
|
|
def test_inbox_showing_inbound_messages(
|
|
|
|
|
|
logged_in_client,
|
2017-06-05 14:48:24 +01:00
|
|
|
|
service_one,
|
2017-05-22 17:02:03 +01:00
|
|
|
|
mock_get_service_templates_when_no_templates_exist,
|
|
|
|
|
|
mock_get_jobs,
|
2018-05-09 13:53:02 +01:00
|
|
|
|
mock_get_service_statistics,
|
2017-05-22 17:02:03 +01:00
|
|
|
|
mock_get_template_statistics,
|
|
|
|
|
|
mock_get_usage,
|
2018-04-04 15:57:31 +01:00
|
|
|
|
mock_get_most_recent_inbound_sms,
|
2017-05-22 17:02:03 +01:00
|
|
|
|
index,
|
|
|
|
|
|
expected_row,
|
|
|
|
|
|
):
|
|
|
|
|
|
|
2017-06-05 14:48:24 +01:00
|
|
|
|
service_one['permissions'] = ['inbound_sms']
|
|
|
|
|
|
|
2017-05-22 17:02:03 +01:00
|
|
|
|
response = logged_in_client.get(url_for('main.inbox', service_id=SERVICE_ONE_ID))
|
|
|
|
|
|
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
|
|
|
|
|
|
|
|
|
|
|
assert response.status_code == 200
|
|
|
|
|
|
rows = page.select('tbody tr')
|
2018-04-04 15:39:50 +01:00
|
|
|
|
assert len(rows) == 8
|
2017-05-22 17:02:03 +01:00
|
|
|
|
assert normalize_spaces(rows[index].text) == expected_row
|
2017-10-17 11:41:12 +01:00
|
|
|
|
assert page.select_one('a[download]')['href'] == url_for(
|
|
|
|
|
|
'main.inbox_download',
|
|
|
|
|
|
service_id=SERVICE_ONE_ID,
|
|
|
|
|
|
)
|
2017-05-22 17:02:03 +01:00
|
|
|
|
|
|
|
|
|
|
|
2018-03-21 15:08:03 +00:00
|
|
|
|
def test_get_inbound_sms_shows_page_links(
|
|
|
|
|
|
logged_in_client,
|
|
|
|
|
|
service_one,
|
|
|
|
|
|
mock_get_service_templates_when_no_templates_exist,
|
|
|
|
|
|
mock_get_jobs,
|
2018-05-09 13:53:02 +01:00
|
|
|
|
mock_get_service_statistics,
|
2018-03-21 15:08:03 +00:00
|
|
|
|
mock_get_template_statistics,
|
|
|
|
|
|
mock_get_usage,
|
2018-04-04 15:57:31 +01:00
|
|
|
|
mock_get_most_recent_inbound_sms,
|
2018-03-21 15:08:03 +00:00
|
|
|
|
mock_get_inbound_number_for_service,
|
|
|
|
|
|
):
|
|
|
|
|
|
service_one['permissions'] = ['inbound_sms']
|
|
|
|
|
|
|
|
|
|
|
|
response = logged_in_client.get(url_for('main.inbox', service_id=SERVICE_ONE_ID, page=2))
|
|
|
|
|
|
|
|
|
|
|
|
assert response.status_code == 200
|
|
|
|
|
|
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
|
|
|
|
|
assert 'Next page' in page.find('li', {'class': 'next-page'}).text
|
|
|
|
|
|
assert 'Previous page' in page.find('li', {'class': 'previous-page'}).text
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-05-22 17:02:03 +01:00
|
|
|
|
def test_empty_inbox(
|
|
|
|
|
|
logged_in_client,
|
2017-06-05 14:48:24 +01:00
|
|
|
|
service_one,
|
2017-05-22 17:02:03 +01:00
|
|
|
|
mock_get_service_templates_when_no_templates_exist,
|
|
|
|
|
|
mock_get_jobs,
|
2018-05-09 13:53:02 +01:00
|
|
|
|
mock_get_service_statistics,
|
2017-05-22 17:02:03 +01:00
|
|
|
|
mock_get_template_statistics,
|
|
|
|
|
|
mock_get_usage,
|
2018-04-04 15:57:31 +01:00
|
|
|
|
mock_get_most_recent_inbound_sms_with_no_messages,
|
2017-08-24 13:57:12 +01:00
|
|
|
|
mock_get_inbound_number_for_service,
|
2017-05-22 17:02:03 +01:00
|
|
|
|
):
|
|
|
|
|
|
|
2017-06-05 14:48:24 +01:00
|
|
|
|
service_one['permissions'] = ['inbound_sms']
|
|
|
|
|
|
|
2017-05-22 17:02:03 +01:00
|
|
|
|
response = logged_in_client.get(url_for('main.inbox', service_id=SERVICE_ONE_ID))
|
|
|
|
|
|
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
|
|
|
|
|
|
|
|
|
|
|
assert response.status_code == 200
|
|
|
|
|
|
assert normalize_spaces(page.select('tbody tr')) == (
|
2017-08-24 13:57:12 +01:00
|
|
|
|
'When users text your service’s phone number (0781239871) you’ll see the messages here'
|
2017-05-22 17:02:03 +01:00
|
|
|
|
)
|
2017-10-17 11:41:12 +01:00
|
|
|
|
assert not page.select('a[download]')
|
2018-03-21 15:08:03 +00:00
|
|
|
|
assert not page.select('li.next-page')
|
|
|
|
|
|
assert not page.select('li.previous-page')
|
2017-05-22 17:02:03 +01:00
|
|
|
|
|
|
|
|
|
|
|
2017-07-12 14:39:50 +01:00
|
|
|
|
@pytest.mark.parametrize('endpoint', [
|
|
|
|
|
|
'main.inbox',
|
|
|
|
|
|
'main.inbox_updates',
|
|
|
|
|
|
])
|
2017-06-05 14:48:24 +01:00
|
|
|
|
def test_inbox_not_accessible_to_service_without_permissions(
|
|
|
|
|
|
logged_in_client,
|
|
|
|
|
|
service_one,
|
2017-07-12 14:39:50 +01:00
|
|
|
|
endpoint,
|
2017-06-05 14:48:24 +01:00
|
|
|
|
):
|
|
|
|
|
|
service_one['permissions'] = []
|
2017-07-12 14:39:50 +01:00
|
|
|
|
response = logged_in_client.get(url_for(endpoint, service_id=SERVICE_ONE_ID))
|
2017-06-05 14:48:24 +01:00
|
|
|
|
|
|
|
|
|
|
assert response.status_code == 403
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-07-07 15:58:40 +01:00
|
|
|
|
def test_anyone_can_see_inbox(
|
|
|
|
|
|
client,
|
|
|
|
|
|
api_user_active,
|
|
|
|
|
|
service_one,
|
|
|
|
|
|
mocker,
|
2018-04-04 15:57:31 +01:00
|
|
|
|
mock_get_most_recent_inbound_sms_with_no_messages,
|
2017-08-24 13:57:12 +01:00
|
|
|
|
mock_get_inbound_number_for_service,
|
2017-07-07 15:58:40 +01:00
|
|
|
|
):
|
|
|
|
|
|
|
|
|
|
|
|
service_one['permissions'] = ['inbound_sms']
|
|
|
|
|
|
|
|
|
|
|
|
validate_route_permission_with_client(
|
|
|
|
|
|
mocker,
|
|
|
|
|
|
client,
|
|
|
|
|
|
'GET',
|
|
|
|
|
|
200,
|
|
|
|
|
|
url_for('main.inbox', service_id=service_one['id']),
|
|
|
|
|
|
['view_activity'],
|
|
|
|
|
|
api_user_active,
|
|
|
|
|
|
service_one,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-07-07 15:51:59 +01:00
|
|
|
|
def test_view_inbox_updates(
|
|
|
|
|
|
logged_in_client,
|
|
|
|
|
|
service_one,
|
|
|
|
|
|
mocker,
|
2018-04-04 15:57:31 +01:00
|
|
|
|
mock_get_most_recent_inbound_sms_with_no_messages,
|
2017-07-07 15:51:59 +01:00
|
|
|
|
):
|
|
|
|
|
|
|
|
|
|
|
|
mock_get_partials = mocker.patch(
|
|
|
|
|
|
'app.main.views.dashboard.get_inbox_partials',
|
|
|
|
|
|
return_value={'messages': 'foo'},
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
response = logged_in_client.get(url_for(
|
|
|
|
|
|
'main.inbox_updates', service_id=SERVICE_ONE_ID,
|
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
|
|
assert response.status_code == 200
|
|
|
|
|
|
assert json.loads(response.get_data(as_text=True)) == {'messages': 'foo'}
|
|
|
|
|
|
|
|
|
|
|
|
mock_get_partials.assert_called_once_with(SERVICE_ONE_ID)
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-10-17 11:41:12 +01:00
|
|
|
|
@freeze_time("2016-07-01 13:00")
|
|
|
|
|
|
def test_download_inbox(
|
|
|
|
|
|
logged_in_client,
|
|
|
|
|
|
mock_get_inbound_sms,
|
|
|
|
|
|
):
|
|
|
|
|
|
response = logged_in_client.get(
|
|
|
|
|
|
url_for('main.inbox_download', service_id=SERVICE_ONE_ID)
|
|
|
|
|
|
)
|
|
|
|
|
|
assert response.status_code == 200
|
|
|
|
|
|
assert response.headers['Content-Type'] == (
|
|
|
|
|
|
'text/csv; '
|
|
|
|
|
|
'charset=utf-8'
|
|
|
|
|
|
)
|
|
|
|
|
|
assert response.headers['Content-Disposition'] == (
|
|
|
|
|
|
'inline; '
|
|
|
|
|
|
'filename="Received text messages 2016-07-01.csv"'
|
|
|
|
|
|
)
|
|
|
|
|
|
assert response.get_data(as_text=True) == (
|
|
|
|
|
|
'Phone number,Message,Received\r\n'
|
|
|
|
|
|
'07900900000,message-1,2016-07-01 13:00\r\n'
|
|
|
|
|
|
'07900900000,message-2,2016-07-01 12:59\r\n'
|
|
|
|
|
|
'07900900000,message-3,2016-07-01 12:59\r\n'
|
|
|
|
|
|
'07900900002,message-4,2016-07-01 10:59\r\n'
|
|
|
|
|
|
'07900900004,message-5,2016-07-01 08:59\r\n'
|
|
|
|
|
|
'07900900006,message-6,2016-07-01 06:59\r\n'
|
|
|
|
|
|
'07900900008,message-7,2016-07-01 04:59\r\n'
|
|
|
|
|
|
'07900900008,message-8,2016-07-01 04:59\r\n'
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@freeze_time("2016-07-01 13:00")
|
|
|
|
|
|
@pytest.mark.parametrize('message_content, expected_cell', [
|
|
|
|
|
|
('=2+5', '2+5'),
|
|
|
|
|
|
('==2+5', '2+5'),
|
|
|
|
|
|
('-2+5', '2+5'),
|
|
|
|
|
|
('+2+5', '2+5'),
|
|
|
|
|
|
('@2+5', '2+5'),
|
|
|
|
|
|
('looks safe,=2+5', '"looks safe,=2+5"'),
|
|
|
|
|
|
])
|
|
|
|
|
|
def test_download_inbox_strips_formulae(
|
|
|
|
|
|
mocker,
|
|
|
|
|
|
logged_in_client,
|
|
|
|
|
|
fake_uuid,
|
|
|
|
|
|
message_content,
|
|
|
|
|
|
expected_cell,
|
|
|
|
|
|
):
|
|
|
|
|
|
|
|
|
|
|
|
mocker.patch(
|
|
|
|
|
|
'app.service_api_client.get_inbound_sms',
|
2018-03-21 15:08:03 +00:00
|
|
|
|
return_value={
|
|
|
|
|
|
'has_next': False,
|
|
|
|
|
|
'data': [{
|
|
|
|
|
|
'user_number': 'elevenchars',
|
|
|
|
|
|
'notify_number': 'foo',
|
|
|
|
|
|
'content': message_content,
|
|
|
|
|
|
'created_at': datetime.utcnow().isoformat(),
|
|
|
|
|
|
'id': fake_uuid,
|
|
|
|
|
|
}]
|
|
|
|
|
|
},
|
2017-10-17 11:41:12 +01:00
|
|
|
|
)
|
|
|
|
|
|
response = logged_in_client.get(
|
|
|
|
|
|
url_for('main.inbox_download', service_id=SERVICE_ONE_ID)
|
|
|
|
|
|
)
|
|
|
|
|
|
assert expected_cell in response.get_data(as_text=True).split('\r\n')[1]
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-02-03 10:42:01 +00:00
|
|
|
|
def test_should_show_recent_templates_on_dashboard(
|
2017-02-03 12:07:21 +00:00
|
|
|
|
logged_in_client,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
mocker,
|
|
|
|
|
|
mock_get_service_templates,
|
|
|
|
|
|
mock_get_jobs,
|
2018-05-09 13:53:02 +01:00
|
|
|
|
mock_get_service_statistics,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
mock_get_usage,
|
2017-08-23 17:07:42 +01:00
|
|
|
|
mock_get_inbound_sms_summary
|
2017-02-03 10:42:01 +00:00
|
|
|
|
):
|
2016-04-06 15:48:04 +01:00
|
|
|
|
mock_template_stats = mocker.patch('app.template_statistics_client.get_template_statistics_for_service',
|
|
|
|
|
|
return_value=copy.deepcopy(stub_template_stats))
|
|
|
|
|
|
|
2017-02-03 12:07:21 +00:00
|
|
|
|
response = logged_in_client.get(url_for('main.service_dashboard', service_id=SERVICE_ONE_ID))
|
2016-01-06 16:51:35 +00:00
|
|
|
|
|
2017-02-03 12:07:21 +00:00
|
|
|
|
assert response.status_code == 200
|
|
|
|
|
|
response.get_data(as_text=True)
|
|
|
|
|
|
mock_template_stats.assert_called_once_with(SERVICE_ONE_ID, limit_days=7)
|
2016-03-09 12:10:50 +00:00
|
|
|
|
|
2017-02-03 12:07:21 +00:00
|
|
|
|
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
|
|
|
|
|
headers = [header.text.strip() for header in page.find_all('h2') + page.find_all('h1')]
|
|
|
|
|
|
assert 'In the last 7 days' in headers
|
2016-05-11 15:05:40 +01:00
|
|
|
|
|
2017-02-03 12:07:21 +00:00
|
|
|
|
table_rows = page.find_all('tbody')[1].find_all('tr')
|
2016-04-06 15:48:04 +01:00
|
|
|
|
|
2018-03-05 21:54:54 +00:00
|
|
|
|
assert len(table_rows) == 4
|
|
|
|
|
|
|
|
|
|
|
|
assert 'Provided as PDF' in table_rows[0].find_all('th')[0].text
|
|
|
|
|
|
assert 'Letter' in table_rows[0].find_all('th')[0].text
|
|
|
|
|
|
assert '400' in table_rows[0].find_all('td')[0].text
|
|
|
|
|
|
|
|
|
|
|
|
assert 'three' in table_rows[1].find_all('th')[0].text
|
|
|
|
|
|
assert 'Letter template' in table_rows[1].find_all('th')[0].text
|
|
|
|
|
|
assert '300' in table_rows[1].find_all('td')[0].text
|
2016-04-20 14:09:38 +01:00
|
|
|
|
|
2018-03-05 21:54:54 +00:00
|
|
|
|
assert 'two' in table_rows[2].find_all('th')[0].text
|
|
|
|
|
|
assert 'Email template' in table_rows[2].find_all('th')[0].text
|
|
|
|
|
|
assert '200' in table_rows[2].find_all('td')[0].text
|
2016-05-11 15:05:40 +01:00
|
|
|
|
|
2018-03-05 21:54:54 +00:00
|
|
|
|
assert 'one' in table_rows[3].find_all('th')[0].text
|
|
|
|
|
|
assert 'Text message template' in table_rows[3].find_all('th')[0].text
|
|
|
|
|
|
assert '100' in table_rows[3].find_all('td')[0].text
|
2016-04-20 14:09:38 +01:00
|
|
|
|
|
|
|
|
|
|
|
2017-11-24 15:20:40 +00:00
|
|
|
|
@freeze_time("2016-07-01 12:00") # 4 months into 2016 financial year
|
|
|
|
|
|
@pytest.mark.parametrize('partial_url', [
|
|
|
|
|
|
partial(url_for),
|
|
|
|
|
|
partial(url_for, year='2016'),
|
|
|
|
|
|
])
|
|
|
|
|
|
def test_should_show_redirect_from_template_history(
|
|
|
|
|
|
logged_in_client,
|
|
|
|
|
|
partial_url,
|
|
|
|
|
|
):
|
|
|
|
|
|
response = logged_in_client.get(
|
|
|
|
|
|
partial_url('main.template_history', service_id=SERVICE_ONE_ID, _external=True)
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
assert response.status_code == 301
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-02-16 15:08:16 +00:00
|
|
|
|
@freeze_time("2016-07-01 12:00") # 4 months into 2016 financial year
|
|
|
|
|
|
@pytest.mark.parametrize('partial_url', [
|
|
|
|
|
|
partial(url_for),
|
|
|
|
|
|
partial(url_for, year='2016'),
|
|
|
|
|
|
])
|
|
|
|
|
|
def test_should_show_monthly_breakdown_of_template_usage(
|
2017-02-03 12:07:21 +00:00
|
|
|
|
logged_in_client,
|
2017-11-24 15:20:40 +00:00
|
|
|
|
mock_get_monthly_template_usage,
|
2017-02-16 15:08:16 +00:00
|
|
|
|
partial_url,
|
2016-04-20 14:09:38 +01:00
|
|
|
|
):
|
2017-02-16 15:08:16 +00:00
|
|
|
|
response = logged_in_client.get(
|
2017-11-24 15:20:40 +00:00
|
|
|
|
partial_url('main.template_usage', service_id=SERVICE_ONE_ID, _external=True)
|
2017-02-16 15:08:16 +00:00
|
|
|
|
)
|
2016-04-20 14:09:38 +01:00
|
|
|
|
|
2017-02-03 12:07:21 +00:00
|
|
|
|
assert response.status_code == 200
|
2017-11-24 15:20:40 +00:00
|
|
|
|
mock_get_monthly_template_usage.assert_called_once_with(SERVICE_ONE_ID, 2016)
|
2016-04-20 14:09:38 +01:00
|
|
|
|
|
2017-02-03 12:07:21 +00:00
|
|
|
|
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
2017-02-16 15:08:16 +00:00
|
|
|
|
table_rows = page.select('tbody tr')
|
2016-04-20 14:09:38 +01:00
|
|
|
|
|
2017-02-16 15:08:16 +00:00
|
|
|
|
assert ' '.join(table_rows[0].text.split()) == (
|
|
|
|
|
|
'My first template '
|
|
|
|
|
|
'Text message template '
|
|
|
|
|
|
'2'
|
|
|
|
|
|
)
|
2016-04-20 14:09:38 +01:00
|
|
|
|
|
2017-02-16 15:08:16 +00:00
|
|
|
|
assert len(table_rows) == len(['April'])
|
|
|
|
|
|
assert len(page.select('.table-no-data')) == len(['May', 'June', 'July'])
|
2016-04-06 15:06:02 +01:00
|
|
|
|
|
2016-03-09 12:10:50 +00:00
|
|
|
|
|
2017-07-07 15:58:40 +01:00
|
|
|
|
def test_anyone_can_see_monthly_breakdown(
|
|
|
|
|
|
client,
|
|
|
|
|
|
api_user_active,
|
|
|
|
|
|
service_one,
|
|
|
|
|
|
mocker,
|
|
|
|
|
|
mock_get_monthly_notification_stats,
|
|
|
|
|
|
):
|
|
|
|
|
|
validate_route_permission_with_client(
|
|
|
|
|
|
mocker,
|
|
|
|
|
|
client,
|
|
|
|
|
|
'GET',
|
|
|
|
|
|
200,
|
|
|
|
|
|
url_for('main.monthly', service_id=service_one['id']),
|
|
|
|
|
|
['view_activity'],
|
|
|
|
|
|
api_user_active,
|
|
|
|
|
|
service_one,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
2018-01-11 14:47:40 +00:00
|
|
|
|
def test_monthly_shows_letters_in_breakdown(
|
|
|
|
|
|
client_request,
|
|
|
|
|
|
service_one,
|
|
|
|
|
|
mock_get_monthly_notification_stats,
|
|
|
|
|
|
):
|
|
|
|
|
|
page = client_request.get(
|
|
|
|
|
|
'main.monthly',
|
|
|
|
|
|
service_id=service_one['id']
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
columns = page.select('.table-field-center-aligned .big-number-label')
|
|
|
|
|
|
|
|
|
|
|
|
assert normalize_spaces(columns[0].text) == 'emails'
|
|
|
|
|
|
assert normalize_spaces(columns[1].text) == 'text messages'
|
|
|
|
|
|
assert normalize_spaces(columns[2].text) == 'letters'
|
|
|
|
|
|
|
|
|
|
|
|
|
2018-04-03 18:13:38 +01:00
|
|
|
|
@pytest.mark.parametrize('endpoint', [
|
|
|
|
|
|
'main.monthly',
|
|
|
|
|
|
'main.template_usage',
|
|
|
|
|
|
])
|
|
|
|
|
|
@freeze_time("2015-01-01 15:15:15.000000")
|
|
|
|
|
|
def test_stats_pages_show_last_3_years(
|
|
|
|
|
|
client_request,
|
|
|
|
|
|
endpoint,
|
|
|
|
|
|
mock_get_monthly_notification_stats,
|
|
|
|
|
|
mock_get_monthly_template_usage,
|
|
|
|
|
|
):
|
|
|
|
|
|
page = client_request.get(
|
|
|
|
|
|
endpoint,
|
|
|
|
|
|
service_id=SERVICE_ONE_ID,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
assert normalize_spaces(page.select_one('.pill').text) == (
|
|
|
|
|
|
'2012 to 2013 financial year '
|
|
|
|
|
|
'2013 to 2014 financial year '
|
|
|
|
|
|
'2014 to 2015 financial year'
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
2018-01-11 14:47:40 +00:00
|
|
|
|
def test_monthly_has_equal_length_tables(
|
|
|
|
|
|
client_request,
|
|
|
|
|
|
service_one,
|
|
|
|
|
|
mock_get_monthly_notification_stats,
|
|
|
|
|
|
):
|
|
|
|
|
|
page = client_request.get(
|
|
|
|
|
|
'main.monthly',
|
|
|
|
|
|
service_id=service_one['id']
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
assert page.select_one('.table-field-headings th').get('width') == "25%"
|
|
|
|
|
|
|
|
|
|
|
|
|
2016-08-09 10:39:57 +01:00
|
|
|
|
@freeze_time("2016-01-01 11:09:00.061258")
|
|
|
|
|
|
def test_should_show_upcoming_jobs_on_dashboard(
|
2017-02-03 12:07:21 +00:00
|
|
|
|
logged_in_client,
|
2016-08-09 10:39:57 +01:00
|
|
|
|
mock_get_service_templates,
|
|
|
|
|
|
mock_get_template_statistics,
|
2018-05-09 13:53:02 +01:00
|
|
|
|
mock_get_service_statistics,
|
2016-08-09 10:39:57 +01:00
|
|
|
|
mock_get_jobs,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
mock_get_usage,
|
2017-08-23 17:07:42 +01:00
|
|
|
|
mock_get_inbound_sms_summary
|
2016-08-09 10:39:57 +01:00
|
|
|
|
):
|
2017-02-03 12:07:21 +00:00
|
|
|
|
response = logged_in_client.get(url_for('main.service_dashboard', service_id=SERVICE_ONE_ID))
|
2016-08-09 10:39:57 +01:00
|
|
|
|
|
2018-07-20 10:18:51 +01:00
|
|
|
|
second_call = mock_get_jobs.call_args_list[1]
|
|
|
|
|
|
assert second_call[0] == (SERVICE_ONE_ID,)
|
|
|
|
|
|
assert second_call[1]['statuses'] == ['scheduled']
|
2016-10-05 17:45:04 +01:00
|
|
|
|
|
2016-08-09 10:39:57 +01:00
|
|
|
|
assert response.status_code == 200
|
|
|
|
|
|
|
|
|
|
|
|
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
|
|
|
|
|
|
|
|
|
|
|
table_rows = page.find_all('tbody')[0].find_all('tr')
|
2016-08-31 16:50:45 +01:00
|
|
|
|
assert len(table_rows) == 2
|
2016-08-09 10:39:57 +01:00
|
|
|
|
|
|
|
|
|
|
assert 'send_me_later.csv' in table_rows[0].find_all('th')[0].text
|
2016-10-12 09:20:32 +01:00
|
|
|
|
assert 'Sending today at 11:09am' in table_rows[0].find_all('th')[0].text
|
2016-08-09 10:39:57 +01:00
|
|
|
|
assert table_rows[0].find_all('td')[0].text.strip() == '1'
|
2016-08-31 16:50:45 +01:00
|
|
|
|
assert 'even_later.csv' in table_rows[1].find_all('th')[0].text
|
2016-10-12 09:20:32 +01:00
|
|
|
|
assert 'Sending today at 11:09pm' in table_rows[1].find_all('th')[0].text
|
2016-08-31 16:50:45 +01:00
|
|
|
|
assert table_rows[1].find_all('td')[0].text.strip() == '1'
|
2016-08-09 10:39:57 +01:00
|
|
|
|
|
|
|
|
|
|
|
2017-10-02 12:34:10 +01:00
|
|
|
|
@pytest.mark.parametrize('permissions, column_name, expected_column_count', [
|
|
|
|
|
|
(['email', 'sms'], '.column-half', 2),
|
|
|
|
|
|
(['email', 'letter'], '.column-third', 3),
|
|
|
|
|
|
(['email', 'sms', 'letter'], '.column-third', 3)
|
|
|
|
|
|
])
|
|
|
|
|
|
def test_correct_columns_display_on_dashboard(
|
|
|
|
|
|
client_request,
|
|
|
|
|
|
mock_get_service_templates,
|
|
|
|
|
|
mock_get_template_statistics,
|
2018-05-09 13:53:02 +01:00
|
|
|
|
mock_get_service_statistics,
|
2017-10-02 12:34:10 +01:00
|
|
|
|
mock_get_jobs,
|
|
|
|
|
|
service_one,
|
|
|
|
|
|
permissions,
|
|
|
|
|
|
expected_column_count,
|
|
|
|
|
|
column_name
|
|
|
|
|
|
):
|
|
|
|
|
|
|
|
|
|
|
|
service_one['permissions'] = permissions
|
|
|
|
|
|
|
|
|
|
|
|
page = client_request.get(
|
|
|
|
|
|
'main.service_dashboard',
|
|
|
|
|
|
service_id=service_one['id']
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
assert len(page.select(column_name)) == expected_column_count
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-11-09 17:17:50 +00:00
|
|
|
|
@pytest.mark.parametrize('permissions, totals, big_number_class, expected_column_count', [
|
|
|
|
|
|
(
|
|
|
|
|
|
['email', 'sms'],
|
|
|
|
|
|
{
|
|
|
|
|
|
'email': {'requested': 0, 'delivered': 0, 'failed': 0},
|
|
|
|
|
|
'sms': {'requested': 999999999, 'delivered': 0, 'failed': 0}
|
|
|
|
|
|
},
|
|
|
|
|
|
'.big-number',
|
|
|
|
|
|
2,
|
|
|
|
|
|
),
|
|
|
|
|
|
(
|
|
|
|
|
|
['email', 'sms'],
|
|
|
|
|
|
{
|
|
|
|
|
|
'email': {'requested': 1000000000, 'delivered': 0, 'failed': 0},
|
|
|
|
|
|
'sms': {'requested': 1000000, 'delivered': 0, 'failed': 0}
|
|
|
|
|
|
},
|
|
|
|
|
|
'.big-number-smaller',
|
|
|
|
|
|
2,
|
|
|
|
|
|
),
|
|
|
|
|
|
(
|
|
|
|
|
|
['email', 'sms', 'letter'],
|
|
|
|
|
|
{
|
|
|
|
|
|
'email': {'requested': 0, 'delivered': 0, 'failed': 0},
|
|
|
|
|
|
'sms': {'requested': 99999, 'delivered': 0, 'failed': 0},
|
|
|
|
|
|
'letter': {'requested': 99999, 'delivered': 0, 'failed': 0}
|
|
|
|
|
|
},
|
|
|
|
|
|
'.big-number',
|
|
|
|
|
|
3,
|
|
|
|
|
|
),
|
|
|
|
|
|
(
|
|
|
|
|
|
['email', 'sms', 'letter'],
|
|
|
|
|
|
{
|
|
|
|
|
|
'email': {'requested': 0, 'delivered': 0, 'failed': 0},
|
|
|
|
|
|
'sms': {'requested': 0, 'delivered': 0, 'failed': 0},
|
|
|
|
|
|
'letter': {'requested': 100000, 'delivered': 0, 'failed': 0},
|
|
|
|
|
|
},
|
|
|
|
|
|
'.big-number-smaller',
|
|
|
|
|
|
3,
|
|
|
|
|
|
),
|
|
|
|
|
|
])
|
|
|
|
|
|
def test_correct_font_size_for_big_numbers(
|
|
|
|
|
|
client_request,
|
|
|
|
|
|
mocker,
|
|
|
|
|
|
mock_get_service_templates,
|
|
|
|
|
|
mock_get_template_statistics,
|
2018-05-09 13:53:02 +01:00
|
|
|
|
mock_get_service_statistics,
|
2017-11-09 17:17:50 +00:00
|
|
|
|
mock_get_jobs,
|
|
|
|
|
|
service_one,
|
|
|
|
|
|
permissions,
|
|
|
|
|
|
totals,
|
|
|
|
|
|
big_number_class,
|
|
|
|
|
|
expected_column_count,
|
|
|
|
|
|
):
|
|
|
|
|
|
|
|
|
|
|
|
service_one['permissions'] = permissions
|
|
|
|
|
|
|
|
|
|
|
|
mocker.patch(
|
|
|
|
|
|
'app.main.views.dashboard.get_dashboard_totals',
|
|
|
|
|
|
return_value=totals
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
page = client_request.get(
|
|
|
|
|
|
'main.service_dashboard',
|
|
|
|
|
|
service_id=service_one['id'],
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
assert expected_column_count == len(
|
|
|
|
|
|
page.select('.big-number-with-status {}'.format(big_number_class))
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
2016-06-19 09:04:21 +01:00
|
|
|
|
@freeze_time("2016-01-01 11:09:00.061258")
|
|
|
|
|
|
def test_should_show_recent_jobs_on_dashboard(
|
2017-02-03 12:07:21 +00:00
|
|
|
|
logged_in_client,
|
2016-08-09 10:39:57 +01:00
|
|
|
|
mock_get_service_templates,
|
|
|
|
|
|
mock_get_template_statistics,
|
2018-05-09 13:53:02 +01:00
|
|
|
|
mock_get_service_statistics,
|
2016-08-09 10:39:57 +01:00
|
|
|
|
mock_get_jobs,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
mock_get_usage,
|
2017-08-23 17:07:42 +01:00
|
|
|
|
mock_get_inbound_sms_summary
|
2016-06-19 09:04:21 +01:00
|
|
|
|
):
|
2017-02-03 12:07:21 +00:00
|
|
|
|
response = logged_in_client.get(url_for('main.service_dashboard', service_id=SERVICE_ONE_ID))
|
2016-06-19 09:04:21 +01:00
|
|
|
|
|
2018-07-20 10:18:51 +01:00
|
|
|
|
third_call = mock_get_jobs.call_args_list[2]
|
|
|
|
|
|
assert third_call[0] == (SERVICE_ONE_ID,)
|
|
|
|
|
|
assert third_call[1]['limit_days'] == 7
|
|
|
|
|
|
assert 'scheduled' not in third_call[1]['statuses']
|
2016-10-05 17:45:04 +01:00
|
|
|
|
|
2016-06-19 09:04:21 +01:00
|
|
|
|
assert response.status_code == 200
|
|
|
|
|
|
|
|
|
|
|
|
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
2016-08-09 10:39:57 +01:00
|
|
|
|
table_rows = page.find_all('tbody')[2].find_all('tr')
|
2016-06-19 09:04:21 +01:00
|
|
|
|
|
|
|
|
|
|
assert len(table_rows) == 4
|
|
|
|
|
|
|
|
|
|
|
|
for index, filename in enumerate((
|
2016-08-22 13:14:35 +01:00
|
|
|
|
"export 1/1/2016.xls",
|
|
|
|
|
|
"all email addresses.xlsx",
|
|
|
|
|
|
"applicants.ods",
|
|
|
|
|
|
"thisisatest.csv",
|
2016-06-19 09:04:21 +01:00
|
|
|
|
)):
|
2016-06-20 10:07:37 +01:00
|
|
|
|
assert filename in table_rows[index].find_all('th')[0].text
|
2016-08-09 10:39:57 +01:00
|
|
|
|
assert 'Sent 1 January at 11:09' in table_rows[index].find_all('th')[0].text
|
2016-06-19 09:04:21 +01:00
|
|
|
|
for column_index, count in enumerate((1, 0, 0)):
|
|
|
|
|
|
assert table_rows[index].find_all('td')[column_index].text.strip() == str(count)
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-01-25 15:59:06 +00:00
|
|
|
|
@freeze_time("2012-03-31 12:12:12")
|
2016-09-29 18:44:10 +01:00
|
|
|
|
def test_usage_page(
|
2017-02-03 12:07:21 +00:00
|
|
|
|
logged_in_client,
|
2016-09-29 18:44:10 +01:00
|
|
|
|
mock_get_usage,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
mock_get_billable_units,
|
2017-10-31 11:22:57 +00:00
|
|
|
|
mock_get_free_sms_fragment_limit
|
2016-09-29 18:44:10 +01:00
|
|
|
|
):
|
2017-01-25 15:59:06 +00:00
|
|
|
|
response = logged_in_client.get(url_for('main.usage', service_id=SERVICE_ONE_ID))
|
2016-09-29 18:44:10 +01:00
|
|
|
|
|
|
|
|
|
|
assert response.status_code == 200
|
|
|
|
|
|
|
2017-01-25 15:59:06 +00:00
|
|
|
|
mock_get_billable_units.assert_called_once_with(SERVICE_ONE_ID, 2011)
|
|
|
|
|
|
mock_get_usage.assert_called_once_with(SERVICE_ONE_ID, 2011)
|
2017-10-31 11:22:57 +00:00
|
|
|
|
mock_get_free_sms_fragment_limit.assert_called_with(SERVICE_ONE_ID, 2011)
|
2016-09-29 18:44:10 +01:00
|
|
|
|
|
|
|
|
|
|
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
|
|
|
|
|
|
2017-12-20 16:28:40 +00:00
|
|
|
|
cols = page.find_all('div', {'class': 'column-half'})
|
|
|
|
|
|
nav = page.find('ul', {'class': 'pill', 'role': 'tablist'})
|
|
|
|
|
|
nav_links = nav.find_all('a')
|
|
|
|
|
|
|
|
|
|
|
|
assert normalize_spaces(nav_links[0].text) == '2010 to 2011 financial year'
|
|
|
|
|
|
assert normalize_spaces(nav.find('li', {'aria-selected': 'true'}).text) == '2011 to 2012 financial year'
|
|
|
|
|
|
assert normalize_spaces(nav_links[1].text) == '2012 to 2013 financial year'
|
|
|
|
|
|
assert '252,190' in cols[1].text
|
|
|
|
|
|
assert 'Text messages' in cols[1].text
|
|
|
|
|
|
|
|
|
|
|
|
table = page.find('table').text.strip()
|
|
|
|
|
|
|
|
|
|
|
|
assert '249,860 free text messages' in table
|
|
|
|
|
|
assert '40 free text messages' in table
|
|
|
|
|
|
assert '960 text messages at 1.65p' in table
|
|
|
|
|
|
assert 'April' in table
|
|
|
|
|
|
assert 'February' in table
|
|
|
|
|
|
assert 'March' in table
|
|
|
|
|
|
assert '£15.84' in table
|
|
|
|
|
|
assert '140 free text messages' in table
|
|
|
|
|
|
assert '£20.30' in table
|
|
|
|
|
|
assert '1,230 text messages at 1.65p' in table
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@freeze_time("2012-03-31 12:12:12")
|
|
|
|
|
|
def test_usage_page_with_letters(
|
|
|
|
|
|
logged_in_client,
|
|
|
|
|
|
service_one,
|
|
|
|
|
|
mock_get_usage,
|
|
|
|
|
|
mock_get_billable_units,
|
|
|
|
|
|
mock_get_free_sms_fragment_limit
|
|
|
|
|
|
):
|
|
|
|
|
|
service_one['permissions'].append('letter')
|
|
|
|
|
|
response = logged_in_client.get(url_for('main.usage', service_id=SERVICE_ONE_ID))
|
|
|
|
|
|
|
|
|
|
|
|
assert response.status_code == 200
|
|
|
|
|
|
|
|
|
|
|
|
mock_get_billable_units.assert_called_once_with(SERVICE_ONE_ID, 2011)
|
|
|
|
|
|
mock_get_usage.assert_called_once_with(SERVICE_ONE_ID, 2011)
|
|
|
|
|
|
mock_get_free_sms_fragment_limit.assert_called_with(SERVICE_ONE_ID, 2011)
|
|
|
|
|
|
|
|
|
|
|
|
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
|
|
|
|
|
|
2017-12-19 14:35:10 +00:00
|
|
|
|
cols = page.find_all('div', {'class': 'column-one-third'})
|
2017-02-14 14:21:36 +00:00
|
|
|
|
nav = page.find('ul', {'class': 'pill', 'role': 'tablist'})
|
2017-01-25 15:59:06 +00:00
|
|
|
|
nav_links = nav.find_all('a')
|
2016-09-29 18:44:10 +01:00
|
|
|
|
|
2017-01-25 15:59:06 +00:00
|
|
|
|
assert normalize_spaces(nav_links[0].text) == '2010 to 2011 financial year'
|
2017-02-14 14:21:36 +00:00
|
|
|
|
assert normalize_spaces(nav.find('li', {'aria-selected': 'true'}).text) == '2011 to 2012 financial year'
|
2017-01-25 15:59:06 +00:00
|
|
|
|
assert normalize_spaces(nav_links[1].text) == '2012 to 2013 financial year'
|
2017-04-26 17:09:07 +01:00
|
|
|
|
assert '252,190' in cols[1].text
|
2017-04-25 19:03:59 +01:00
|
|
|
|
assert 'Text messages' in cols[1].text
|
|
|
|
|
|
|
|
|
|
|
|
table = page.find('table').text.strip()
|
|
|
|
|
|
|
2017-04-26 17:09:07 +01:00
|
|
|
|
assert '249,860 free text messages' in table
|
|
|
|
|
|
assert '40 free text messages' in table
|
|
|
|
|
|
assert '960 text messages at 1.65p' in table
|
2017-04-25 19:03:59 +01:00
|
|
|
|
assert 'April' in table
|
2017-04-26 17:09:07 +01:00
|
|
|
|
assert 'February' in table
|
2017-04-25 19:03:59 +01:00
|
|
|
|
assert 'March' in table
|
2018-05-22 17:37:48 +01:00
|
|
|
|
assert '£20.59' in table
|
2017-04-26 17:09:07 +01:00
|
|
|
|
assert '140 free text messages' in table
|
2017-04-25 19:03:59 +01:00
|
|
|
|
assert '£20.30' in table
|
2017-04-26 17:09:07 +01:00
|
|
|
|
assert '1,230 text messages at 1.65p' in table
|
2018-10-03 15:15:19 +01:00
|
|
|
|
assert '10 second class letters at 31p' in normalize_spaces(table)
|
|
|
|
|
|
assert '5 first class letters at 33p' in normalize_spaces(table)
|
2018-10-03 11:18:46 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@freeze_time("2012-04-30 12:12:12")
|
|
|
|
|
|
def test_usage_page_displays_letters_ordered_by_postage(
|
|
|
|
|
|
mocker,
|
|
|
|
|
|
logged_in_client,
|
|
|
|
|
|
service_one,
|
|
|
|
|
|
mock_get_usage,
|
|
|
|
|
|
mock_get_free_sms_fragment_limit
|
|
|
|
|
|
):
|
|
|
|
|
|
billable_units_resp = [
|
|
|
|
|
|
{'month': 'April', 'notification_type': 'letter', 'rate': 0.5, 'billing_units': 1, 'postage': 'second'},
|
|
|
|
|
|
{'month': 'April', 'notification_type': 'letter', 'rate': 0.3, 'billing_units': 3, 'postage': 'second'},
|
|
|
|
|
|
{'month': 'April', 'notification_type': 'letter', 'rate': 0.5, 'billing_units': 1, 'postage': 'first'},
|
|
|
|
|
|
]
|
|
|
|
|
|
mocker.patch('app.billing_api_client.get_billable_units_ft', return_value=billable_units_resp)
|
|
|
|
|
|
service_one['permissions'].append('letter')
|
|
|
|
|
|
response = logged_in_client.get(url_for('main.usage', service_id=SERVICE_ONE_ID))
|
|
|
|
|
|
|
|
|
|
|
|
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
|
|
|
|
|
row_for_april = page.find('table').find('tr', class_='table-row')
|
|
|
|
|
|
postage_details = row_for_april.find_all('li', class_='tabular-numbers')
|
|
|
|
|
|
|
|
|
|
|
|
assert len(postage_details) == 3
|
2018-10-03 15:15:19 +01:00
|
|
|
|
assert normalize_spaces(postage_details[0].text) == '1 first class letter at 50p'
|
2018-10-03 11:18:46 +01:00
|
|
|
|
assert normalize_spaces(postage_details[1].text) == '3 second class letters at 30p'
|
2018-10-03 15:15:19 +01:00
|
|
|
|
assert normalize_spaces(postage_details[2].text) == '1 second class letter at 50p'
|
2017-04-25 19:03:59 +01:00
|
|
|
|
|
|
|
|
|
|
|
2017-01-25 15:59:06 +00:00
|
|
|
|
def test_usage_page_with_year_argument(
|
|
|
|
|
|
logged_in_client,
|
|
|
|
|
|
mock_get_usage,
|
2017-10-31 11:22:57 +00:00
|
|
|
|
mock_get_billable_units,
|
|
|
|
|
|
mock_get_free_sms_fragment_limit,
|
2017-01-25 15:59:06 +00:00
|
|
|
|
):
|
|
|
|
|
|
assert logged_in_client.get(url_for('main.usage', service_id=SERVICE_ONE_ID, year=2000)).status_code == 200
|
|
|
|
|
|
mock_get_billable_units.assert_called_once_with(SERVICE_ONE_ID, 2000)
|
|
|
|
|
|
mock_get_usage.assert_called_once_with(SERVICE_ONE_ID, 2000)
|
2017-10-31 11:22:57 +00:00
|
|
|
|
mock_get_free_sms_fragment_limit.assert_called_with(SERVICE_ONE_ID, 2000)
|
2017-01-25 15:59:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
2016-09-29 18:44:10 +01:00
|
|
|
|
def test_usage_page_for_invalid_year(
|
2017-02-03 12:07:21 +00:00
|
|
|
|
logged_in_client,
|
2016-09-29 18:44:10 +01:00
|
|
|
|
):
|
2017-02-03 12:07:21 +00:00
|
|
|
|
assert logged_in_client.get(url_for('main.usage', service_id=SERVICE_ONE_ID, year='abcd')).status_code == 404
|
2016-09-29 18:44:10 +01:00
|
|
|
|
|
|
|
|
|
|
|
2017-05-02 14:10:56 +01:00
|
|
|
|
@freeze_time("2012-03-31 12:12:12")
|
|
|
|
|
|
def test_future_usage_page(
|
|
|
|
|
|
logged_in_client,
|
|
|
|
|
|
mock_get_future_usage,
|
|
|
|
|
|
mock_get_future_billable_units,
|
2017-10-31 11:22:57 +00:00
|
|
|
|
mock_get_free_sms_fragment_limit
|
2017-05-02 14:10:56 +01:00
|
|
|
|
):
|
|
|
|
|
|
assert logged_in_client.get(url_for('main.usage', service_id=SERVICE_ONE_ID, year=2014)).status_code == 200
|
|
|
|
|
|
|
|
|
|
|
|
mock_get_future_billable_units.assert_called_once_with(SERVICE_ONE_ID, 2014)
|
|
|
|
|
|
mock_get_future_usage.assert_called_once_with(SERVICE_ONE_ID, 2014)
|
2017-10-31 11:22:57 +00:00
|
|
|
|
mock_get_free_sms_fragment_limit.assert_called_with(SERVICE_ONE_ID, 2014)
|
2017-05-02 14:10:56 +01:00
|
|
|
|
|
|
|
|
|
|
|
2016-03-09 12:10:50 +00:00
|
|
|
|
def _test_dashboard_menu(mocker, app_, usr, service, permissions):
|
|
|
|
|
|
with app_.test_request_context():
|
|
|
|
|
|
with app_.test_client() as client:
|
|
|
|
|
|
usr._permissions[str(service['id'])] = permissions
|
2018-11-19 15:26:43 +00:00
|
|
|
|
usr.services = [service['id']]
|
2016-03-30 09:31:53 +01:00
|
|
|
|
mocker.patch('app.user_api_client.check_verify_code', return_value=(True, ''))
|
|
|
|
|
|
mocker.patch('app.service_api_client.get_services', return_value={'data': [service]})
|
2016-03-09 12:10:50 +00:00
|
|
|
|
mocker.patch('app.user_api_client.get_user', return_value=usr)
|
|
|
|
|
|
mocker.patch('app.user_api_client.get_user_by_email', return_value=usr)
|
2016-03-17 10:46:47 +00:00
|
|
|
|
mocker.patch('app.service_api_client.get_service', return_value={'data': service})
|
2016-03-09 12:10:50 +00:00
|
|
|
|
client.login(usr)
|
|
|
|
|
|
return client.get(url_for('main.service_dashboard', service_id=service['id']))
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-02-03 10:42:01 +00:00
|
|
|
|
def test_menu_send_messages(
|
|
|
|
|
|
mocker,
|
|
|
|
|
|
app_,
|
|
|
|
|
|
api_user_active,
|
|
|
|
|
|
service_one,
|
|
|
|
|
|
mock_get_service_templates,
|
|
|
|
|
|
mock_get_jobs,
|
|
|
|
|
|
mock_get_template_statistics,
|
2018-05-09 13:53:02 +01:00
|
|
|
|
mock_get_service_statistics,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
mock_get_usage,
|
2017-11-09 13:18:09 +00:00
|
|
|
|
mock_get_inbound_sms_summary,
|
|
|
|
|
|
mock_get_free_sms_fragment_limit,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
):
|
2016-03-09 12:10:50 +00:00
|
|
|
|
with app_.test_request_context():
|
|
|
|
|
|
resp = _test_dashboard_menu(
|
|
|
|
|
|
mocker,
|
|
|
|
|
|
app_,
|
|
|
|
|
|
api_user_active,
|
|
|
|
|
|
service_one,
|
2018-02-28 17:22:20 +00:00
|
|
|
|
['view_activity', 'send_messages'])
|
2016-03-09 12:10:50 +00:00
|
|
|
|
page = resp.get_data(as_text=True)
|
|
|
|
|
|
assert url_for(
|
|
|
|
|
|
'main.choose_template',
|
|
|
|
|
|
service_id=service_one['id'],
|
Merge email, text message + letter templates pages
Right now we have separate pages for email and text message templates.
In the future we will also have a separate page for letter templates.
This commit changes Notify to only have one page for all templates.
What is the problem?
---
The left-hand navigation is getting quite crowded, at 8 items for a
service that can send letters. Research suggests that the number of
objects an average human can hold in working memory is 7 ± 2 [1]. So
we’re at the limit of how many items the navigation should have.
In the future we will need to search/sort/filter templates by attributes
other than type, for example:
- show me the ‘confirmation’ templates
- show me the most recently used templates
- show me all templates containing the placeholder `((ref_no))`
These are hypothetical for now, but these needs (or others) may become
real in the future. At this point pre-filtering the list of templates
by type would restrict what searches a user could do. So by making this
change now we’re in a better position to iterate the design in the
future.
What’s the change?
---
This commit replaces the ‘Email templates’, ‘Text message templates’ and
‘Letter templates’ pages with one page called ‘Templates’.
This new templates page shows all the templates for the service, sorted
by most recently created first (as before).
To add a new template there is a new page with a form asking you what
kind of template you want to create. This is necessary because in the
past we knew what kind of template you wanted to create based on the
kind you were looking at.
What’s the impact of this change on new users?
---
This change alters the onboarding process slightly. We still want to
take people through the empty templates page from the call-to-action on
the dashboard because it helps them understand that to send a message
using Notify you need a template. But because we don’t have separate
pages for emails/text messages we will have to send users through the
extra step of choosing what kind of template to create. This is a bit
clunkier on first use but:
- it still gets the point across
- it takes them through the actual flow they will be using to create new
templates in the future (ie they’re learning how to use Notify, not
just being taken through a special onboarding route)
I’m not too worried about this change in terms of the experience for new
users. Furthermore, by making it now we get to validate whether it’s
causing any problems in the lab research booked for next week.
What’s the impact of this change on current services?
---
Looking at the top 15 services by number of templates[2], most are using
either text messages or emails. So this change would not have a
significant impact on these services because the page will not get any
longer. In other words we wouldn’t be making it worse for them.
Those services who do use both are not using as many templates. The
worst-case scenario is SSCS, who have 16 templates, evenly split between
email and text messages. So they would go from having 8 templates per
page to 16, which is still less than half the number that HMPO or
Digital Marketplace are managing.
References
---
1. https://en.wikipedia.org/wiki/The_Magical_Number_Seven,_Plus_or_Minus_Two
2. Template usage by service
Service name | Template count | Template types
---------------------------------------|----------------|---------------
Her Majesty's Passport Office | 40 | sms
Digital Marketplace | 40 | email
GovWifi-Staging | 19 | sms
GovWifi | 18 | sms
Digital Apprenticeship Service | 16 | email
SSCS | 16 | both
Crown Commercial Service MI Collection | 15 | email
Help with Prison Visits | 12 | both
Digital Future | 12 | email
Export Licensing Service | 11 | email
Civil Money Claims | 9 | both
DVLA Drivers Medical Service | 9 | sms
GOV.UK Notify | 8 | both
Manage your benefit overpayments | 8 | both
Tax Renewals | 8 | both
2017-02-28 12:16:35 +00:00
|
|
|
|
) in page
|
2016-03-21 15:25:19 +00:00
|
|
|
|
assert url_for('main.manage_users', service_id=service_one['id']) in page
|
2016-03-09 12:10:50 +00:00
|
|
|
|
|
2016-03-30 09:31:53 +01:00
|
|
|
|
assert url_for('main.service_settings', service_id=service_one['id']) not in page
|
2016-03-09 12:10:50 +00:00
|
|
|
|
assert url_for('main.api_keys', service_id=service_one['id']) not in page
|
2016-05-11 09:43:55 +01:00
|
|
|
|
assert url_for('main.view_providers') not in page
|
2016-03-09 12:10:50 +00:00
|
|
|
|
|
|
|
|
|
|
|
2017-02-03 10:42:01 +00:00
|
|
|
|
def test_menu_manage_service(
|
|
|
|
|
|
mocker,
|
|
|
|
|
|
app_,
|
|
|
|
|
|
api_user_active,
|
|
|
|
|
|
service_one,
|
|
|
|
|
|
mock_get_service_templates,
|
|
|
|
|
|
mock_get_jobs,
|
|
|
|
|
|
mock_get_template_statistics,
|
2018-05-09 13:53:02 +01:00
|
|
|
|
mock_get_service_statistics,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
mock_get_usage,
|
2017-11-09 13:18:09 +00:00
|
|
|
|
mock_get_inbound_sms_summary,
|
|
|
|
|
|
mock_get_free_sms_fragment_limit,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
):
|
2016-03-09 12:10:50 +00:00
|
|
|
|
with app_.test_request_context():
|
|
|
|
|
|
resp = _test_dashboard_menu(
|
|
|
|
|
|
mocker,
|
|
|
|
|
|
app_,
|
|
|
|
|
|
api_user_active,
|
|
|
|
|
|
service_one,
|
2018-02-28 17:22:20 +00:00
|
|
|
|
['view_activity', 'manage_templates', 'manage_service'])
|
2016-03-09 12:10:50 +00:00
|
|
|
|
page = resp.get_data(as_text=True)
|
|
|
|
|
|
assert url_for(
|
|
|
|
|
|
'main.choose_template',
|
|
|
|
|
|
service_id=service_one['id'],
|
Merge email, text message + letter templates pages
Right now we have separate pages for email and text message templates.
In the future we will also have a separate page for letter templates.
This commit changes Notify to only have one page for all templates.
What is the problem?
---
The left-hand navigation is getting quite crowded, at 8 items for a
service that can send letters. Research suggests that the number of
objects an average human can hold in working memory is 7 ± 2 [1]. So
we’re at the limit of how many items the navigation should have.
In the future we will need to search/sort/filter templates by attributes
other than type, for example:
- show me the ‘confirmation’ templates
- show me the most recently used templates
- show me all templates containing the placeholder `((ref_no))`
These are hypothetical for now, but these needs (or others) may become
real in the future. At this point pre-filtering the list of templates
by type would restrict what searches a user could do. So by making this
change now we’re in a better position to iterate the design in the
future.
What’s the change?
---
This commit replaces the ‘Email templates’, ‘Text message templates’ and
‘Letter templates’ pages with one page called ‘Templates’.
This new templates page shows all the templates for the service, sorted
by most recently created first (as before).
To add a new template there is a new page with a form asking you what
kind of template you want to create. This is necessary because in the
past we knew what kind of template you wanted to create based on the
kind you were looking at.
What’s the impact of this change on new users?
---
This change alters the onboarding process slightly. We still want to
take people through the empty templates page from the call-to-action on
the dashboard because it helps them understand that to send a message
using Notify you need a template. But because we don’t have separate
pages for emails/text messages we will have to send users through the
extra step of choosing what kind of template to create. This is a bit
clunkier on first use but:
- it still gets the point across
- it takes them through the actual flow they will be using to create new
templates in the future (ie they’re learning how to use Notify, not
just being taken through a special onboarding route)
I’m not too worried about this change in terms of the experience for new
users. Furthermore, by making it now we get to validate whether it’s
causing any problems in the lab research booked for next week.
What’s the impact of this change on current services?
---
Looking at the top 15 services by number of templates[2], most are using
either text messages or emails. So this change would not have a
significant impact on these services because the page will not get any
longer. In other words we wouldn’t be making it worse for them.
Those services who do use both are not using as many templates. The
worst-case scenario is SSCS, who have 16 templates, evenly split between
email and text messages. So they would go from having 8 templates per
page to 16, which is still less than half the number that HMPO or
Digital Marketplace are managing.
References
---
1. https://en.wikipedia.org/wiki/The_Magical_Number_Seven,_Plus_or_Minus_Two
2. Template usage by service
Service name | Template count | Template types
---------------------------------------|----------------|---------------
Her Majesty's Passport Office | 40 | sms
Digital Marketplace | 40 | email
GovWifi-Staging | 19 | sms
GovWifi | 18 | sms
Digital Apprenticeship Service | 16 | email
SSCS | 16 | both
Crown Commercial Service MI Collection | 15 | email
Help with Prison Visits | 12 | both
Digital Future | 12 | email
Export Licensing Service | 11 | email
Civil Money Claims | 9 | both
DVLA Drivers Medical Service | 9 | sms
GOV.UK Notify | 8 | both
Manage your benefit overpayments | 8 | both
Tax Renewals | 8 | both
2017-02-28 12:16:35 +00:00
|
|
|
|
) in page
|
2016-03-09 12:10:50 +00:00
|
|
|
|
assert url_for('main.manage_users', service_id=service_one['id']) in page
|
|
|
|
|
|
assert url_for('main.service_settings', service_id=service_one['id']) in page
|
|
|
|
|
|
|
|
|
|
|
|
assert url_for('main.api_keys', service_id=service_one['id']) not in page
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-02-03 10:42:01 +00:00
|
|
|
|
def test_menu_manage_api_keys(
|
|
|
|
|
|
mocker,
|
|
|
|
|
|
app_,
|
|
|
|
|
|
api_user_active,
|
|
|
|
|
|
service_one,
|
|
|
|
|
|
mock_get_service_templates,
|
|
|
|
|
|
mock_get_jobs,
|
|
|
|
|
|
mock_get_template_statistics,
|
2018-05-09 13:53:02 +01:00
|
|
|
|
mock_get_service_statistics,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
mock_get_usage,
|
2017-11-09 13:18:09 +00:00
|
|
|
|
mock_get_inbound_sms_summary,
|
|
|
|
|
|
mock_get_free_sms_fragment_limit,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
):
|
2016-03-09 12:10:50 +00:00
|
|
|
|
with app_.test_request_context():
|
|
|
|
|
|
resp = _test_dashboard_menu(
|
|
|
|
|
|
mocker,
|
|
|
|
|
|
app_,
|
|
|
|
|
|
api_user_active,
|
|
|
|
|
|
service_one,
|
2016-03-29 17:33:12 +01:00
|
|
|
|
['view_activity', 'manage_api_keys'])
|
2018-01-25 15:29:05 +00:00
|
|
|
|
|
2016-03-09 12:10:50 +00:00
|
|
|
|
page = resp.get_data(as_text=True)
|
|
|
|
|
|
|
2018-01-25 15:29:05 +00:00
|
|
|
|
assert url_for('main.choose_template', service_id=service_one['id'],) in page
|
|
|
|
|
|
assert url_for('main.manage_users', service_id=service_one['id']) in page
|
|
|
|
|
|
assert url_for('main.service_settings', service_id=service_one['id']) in page
|
2016-09-20 11:34:37 +01:00
|
|
|
|
assert url_for('main.api_integration', service_id=service_one['id']) in page
|
2016-03-17 10:46:47 +00:00
|
|
|
|
|
|
|
|
|
|
|
2017-02-03 10:42:01 +00:00
|
|
|
|
def test_menu_all_services_for_platform_admin_user(
|
|
|
|
|
|
mocker,
|
|
|
|
|
|
app_,
|
|
|
|
|
|
platform_admin_user,
|
|
|
|
|
|
service_one,
|
|
|
|
|
|
mock_get_service_templates,
|
|
|
|
|
|
mock_get_jobs,
|
|
|
|
|
|
mock_get_template_statistics,
|
2018-05-09 13:53:02 +01:00
|
|
|
|
mock_get_service_statistics,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
mock_get_usage,
|
2017-11-09 13:18:09 +00:00
|
|
|
|
mock_get_inbound_sms_summary,
|
|
|
|
|
|
mock_get_free_sms_fragment_limit,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
):
|
2016-03-17 10:46:47 +00:00
|
|
|
|
with app_.test_request_context():
|
|
|
|
|
|
resp = _test_dashboard_menu(
|
|
|
|
|
|
mocker,
|
|
|
|
|
|
app_,
|
|
|
|
|
|
platform_admin_user,
|
|
|
|
|
|
service_one,
|
|
|
|
|
|
[])
|
|
|
|
|
|
page = resp.get_data(as_text=True)
|
Merge email, text message + letter templates pages
Right now we have separate pages for email and text message templates.
In the future we will also have a separate page for letter templates.
This commit changes Notify to only have one page for all templates.
What is the problem?
---
The left-hand navigation is getting quite crowded, at 8 items for a
service that can send letters. Research suggests that the number of
objects an average human can hold in working memory is 7 ± 2 [1]. So
we’re at the limit of how many items the navigation should have.
In the future we will need to search/sort/filter templates by attributes
other than type, for example:
- show me the ‘confirmation’ templates
- show me the most recently used templates
- show me all templates containing the placeholder `((ref_no))`
These are hypothetical for now, but these needs (or others) may become
real in the future. At this point pre-filtering the list of templates
by type would restrict what searches a user could do. So by making this
change now we’re in a better position to iterate the design in the
future.
What’s the change?
---
This commit replaces the ‘Email templates’, ‘Text message templates’ and
‘Letter templates’ pages with one page called ‘Templates’.
This new templates page shows all the templates for the service, sorted
by most recently created first (as before).
To add a new template there is a new page with a form asking you what
kind of template you want to create. This is necessary because in the
past we knew what kind of template you wanted to create based on the
kind you were looking at.
What’s the impact of this change on new users?
---
This change alters the onboarding process slightly. We still want to
take people through the empty templates page from the call-to-action on
the dashboard because it helps them understand that to send a message
using Notify you need a template. But because we don’t have separate
pages for emails/text messages we will have to send users through the
extra step of choosing what kind of template to create. This is a bit
clunkier on first use but:
- it still gets the point across
- it takes them through the actual flow they will be using to create new
templates in the future (ie they’re learning how to use Notify, not
just being taken through a special onboarding route)
I’m not too worried about this change in terms of the experience for new
users. Furthermore, by making it now we get to validate whether it’s
causing any problems in the lab research booked for next week.
What’s the impact of this change on current services?
---
Looking at the top 15 services by number of templates[2], most are using
either text messages or emails. So this change would not have a
significant impact on these services because the page will not get any
longer. In other words we wouldn’t be making it worse for them.
Those services who do use both are not using as many templates. The
worst-case scenario is SSCS, who have 16 templates, evenly split between
email and text messages. So they would go from having 8 templates per
page to 16, which is still less than half the number that HMPO or
Digital Marketplace are managing.
References
---
1. https://en.wikipedia.org/wiki/The_Magical_Number_Seven,_Plus_or_Minus_Two
2. Template usage by service
Service name | Template count | Template types
---------------------------------------|----------------|---------------
Her Majesty's Passport Office | 40 | sms
Digital Marketplace | 40 | email
GovWifi-Staging | 19 | sms
GovWifi | 18 | sms
Digital Apprenticeship Service | 16 | email
SSCS | 16 | both
Crown Commercial Service MI Collection | 15 | email
Help with Prison Visits | 12 | both
Digital Future | 12 | email
Export Licensing Service | 11 | email
Civil Money Claims | 9 | both
DVLA Drivers Medical Service | 9 | sms
GOV.UK Notify | 8 | both
Manage your benefit overpayments | 8 | both
Tax Renewals | 8 | both
2017-02-28 12:16:35 +00:00
|
|
|
|
assert url_for('main.choose_template', service_id=service_one['id']) in page
|
2016-03-21 15:36:47 +00:00
|
|
|
|
assert url_for('main.manage_users', service_id=service_one['id']) in page
|
|
|
|
|
|
assert url_for('main.service_settings', service_id=service_one['id']) in page
|
2016-06-07 11:17:33 +01:00
|
|
|
|
assert url_for('main.view_notifications', service_id=service_one['id'], message_type='email') in page
|
|
|
|
|
|
assert url_for('main.view_notifications', service_id=service_one['id'], message_type='sms') in page
|
2016-03-21 15:36:47 +00:00
|
|
|
|
assert url_for('main.api_keys', service_id=service_one['id']) not in page
|
2016-04-12 14:19:51 +01:00
|
|
|
|
|
2016-03-23 12:15:57 +00:00
|
|
|
|
|
2017-02-03 10:42:01 +00:00
|
|
|
|
def test_route_for_service_permissions(
|
|
|
|
|
|
mocker,
|
|
|
|
|
|
app_,
|
|
|
|
|
|
api_user_active,
|
|
|
|
|
|
service_one,
|
|
|
|
|
|
mock_get_service,
|
|
|
|
|
|
mock_get_user,
|
|
|
|
|
|
mock_get_service_templates,
|
|
|
|
|
|
mock_get_jobs,
|
|
|
|
|
|
mock_get_template_statistics,
|
2018-05-09 13:53:02 +01:00
|
|
|
|
mock_get_service_statistics,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
mock_get_usage,
|
2017-08-23 17:07:42 +01:00
|
|
|
|
mock_get_inbound_sms_summary
|
2017-02-03 10:42:01 +00:00
|
|
|
|
):
|
2016-03-23 12:15:57 +00:00
|
|
|
|
with app_.test_request_context():
|
2016-11-02 16:53:40 +00:00
|
|
|
|
validate_route_permission(
|
|
|
|
|
|
mocker,
|
|
|
|
|
|
app_,
|
|
|
|
|
|
"GET",
|
|
|
|
|
|
200,
|
|
|
|
|
|
url_for('main.service_dashboard', service_id=service_one['id']),
|
|
|
|
|
|
['view_activity'],
|
|
|
|
|
|
api_user_active,
|
|
|
|
|
|
service_one)
|
2016-04-06 15:48:04 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_aggregate_template_stats():
|
2019-01-15 16:19:23 +00:00
|
|
|
|
expected = aggregate_template_usage(copy.deepcopy(stub_template_stats))
|
2018-03-05 21:54:54 +00:00
|
|
|
|
assert len(expected) == 4
|
|
|
|
|
|
assert expected[0]['template_name'] == 'four'
|
|
|
|
|
|
assert expected[0]['count'] == 400
|
|
|
|
|
|
assert expected[0]['template_id'] == 'id-4'
|
|
|
|
|
|
assert expected[0]['template_type'] == 'letter'
|
|
|
|
|
|
assert expected[1]['template_name'] == 'three'
|
|
|
|
|
|
assert expected[1]['count'] == 300
|
|
|
|
|
|
assert expected[1]['template_id'] == 'id-3'
|
|
|
|
|
|
assert expected[1]['template_type'] == 'letter'
|
|
|
|
|
|
assert expected[2]['template_name'] == 'two'
|
|
|
|
|
|
assert expected[2]['count'] == 200
|
|
|
|
|
|
assert expected[2]['template_id'] == 'id-2'
|
|
|
|
|
|
assert expected[2]['template_type'] == 'email'
|
|
|
|
|
|
assert expected[3]['template_name'] == 'one'
|
|
|
|
|
|
assert expected[3]['count'] == 100
|
|
|
|
|
|
assert expected[3]['template_id'] == 'id-1'
|
|
|
|
|
|
assert expected[3]['template_type'] == 'sms'
|
2016-07-19 13:53:27 +01:00
|
|
|
|
|
|
|
|
|
|
|
2019-01-16 10:54:52 +00:00
|
|
|
|
def test_aggregate_notifications_stats():
|
|
|
|
|
|
expected = aggregate_notifications_stats(copy.deepcopy(stub_template_stats))
|
|
|
|
|
|
assert expected == {
|
|
|
|
|
|
"sms": {"requested": 100, "delivered": 50, "failed": 0},
|
|
|
|
|
|
"letter": {"requested": 700, "delivered": 700, "failed": 0},
|
|
|
|
|
|
"email": {"requested": 200, "delivered": 0, "failed": 100}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-02-03 10:42:01 +00:00
|
|
|
|
def test_service_dashboard_updates_gets_dashboard_totals(
|
|
|
|
|
|
mocker,
|
2017-02-03 12:07:21 +00:00
|
|
|
|
logged_in_client,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
mock_get_service_templates,
|
|
|
|
|
|
mock_get_template_statistics,
|
2018-05-09 13:53:02 +01:00
|
|
|
|
mock_get_service_statistics,
|
2017-02-03 10:42:01 +00:00
|
|
|
|
mock_get_jobs,
|
|
|
|
|
|
mock_get_usage,
|
2017-08-23 17:07:42 +01:00
|
|
|
|
mock_get_inbound_sms_summary
|
2017-02-03 10:42:01 +00:00
|
|
|
|
):
|
2017-04-07 10:54:52 +01:00
|
|
|
|
mocker.patch('app.main.views.dashboard.get_dashboard_totals', return_value={
|
2016-07-20 14:12:03 +01:00
|
|
|
|
'email': {'requested': 123, 'delivered': 0, 'failed': 0},
|
|
|
|
|
|
'sms': {'requested': 456, 'delivered': 0, 'failed': 0}
|
2016-07-19 17:10:48 +01:00
|
|
|
|
})
|
|
|
|
|
|
|
2017-02-03 12:07:21 +00:00
|
|
|
|
response = logged_in_client.get(url_for('main.service_dashboard', service_id=SERVICE_ONE_ID))
|
2016-07-19 13:53:27 +01:00
|
|
|
|
|
|
|
|
|
|
assert response.status_code == 200
|
2016-07-20 14:12:03 +01:00
|
|
|
|
|
|
|
|
|
|
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
|
|
|
|
|
numbers = [number.text.strip() for number in page.find_all('div', class_='big-number-number')]
|
|
|
|
|
|
assert '123' in numbers
|
|
|
|
|
|
assert '456' in numbers
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_get_dashboard_totals_adds_percentages():
|
|
|
|
|
|
stats = {
|
|
|
|
|
|
'sms': {
|
|
|
|
|
|
'requested': 3,
|
|
|
|
|
|
'delivered': 0,
|
|
|
|
|
|
'failed': 2
|
|
|
|
|
|
},
|
|
|
|
|
|
'email': {
|
|
|
|
|
|
'requested': 0,
|
|
|
|
|
|
'delivered': 0,
|
|
|
|
|
|
'failed': 0
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
assert get_dashboard_totals(stats)['sms']['failed_percentage'] == '66.7'
|
|
|
|
|
|
assert get_dashboard_totals(stats)['email']['failed_percentage'] == '0'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
|
|
|
|
'failures,expected', [
|
|
|
|
|
|
(2, False),
|
|
|
|
|
|
(3, False),
|
|
|
|
|
|
(4, True)
|
|
|
|
|
|
]
|
|
|
|
|
|
)
|
|
|
|
|
|
def test_get_dashboard_totals_adds_warning(failures, expected):
|
|
|
|
|
|
stats = {
|
|
|
|
|
|
'sms': {
|
|
|
|
|
|
'requested': 100,
|
|
|
|
|
|
'delivered': 0,
|
|
|
|
|
|
'failed': failures
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
assert get_dashboard_totals(stats)['sms']['show_warning'] == expected
|
2016-07-28 18:09:17 +01:00
|
|
|
|
|
|
|
|
|
|
|
2017-01-30 17:27:09 +00:00
|
|
|
|
def test_format_monthly_stats_empty_case():
|
|
|
|
|
|
assert format_monthly_stats_to_list({}) == []
|
2016-07-28 18:09:17 +01:00
|
|
|
|
|
|
|
|
|
|
|
2017-01-30 17:27:09 +00:00
|
|
|
|
def test_format_monthly_stats_labels_month():
|
|
|
|
|
|
resp = format_monthly_stats_to_list({'2016-07': {}})
|
|
|
|
|
|
assert resp[0]['name'] == 'July'
|
2016-07-28 18:09:17 +01:00
|
|
|
|
|
|
|
|
|
|
|
2017-01-30 17:27:09 +00:00
|
|
|
|
def test_format_monthly_stats_has_stats_with_failure_rate():
|
|
|
|
|
|
resp = format_monthly_stats_to_list({
|
|
|
|
|
|
'2016-07': {'sms': _stats(3, 1, 2)}
|
|
|
|
|
|
})
|
|
|
|
|
|
assert resp[0]['sms_counts'] == {
|
|
|
|
|
|
'failed': 2,
|
|
|
|
|
|
'failed_percentage': '66.7',
|
|
|
|
|
|
'requested': 3,
|
|
|
|
|
|
'show_warning': True,
|
2016-07-28 18:09:17 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2017-01-30 17:27:09 +00:00
|
|
|
|
def test_format_monthly_stats_works_for_email_letter():
|
|
|
|
|
|
resp = format_monthly_stats_to_list({
|
|
|
|
|
|
'2016-07': {
|
|
|
|
|
|
'sms': {},
|
|
|
|
|
|
'email': {},
|
|
|
|
|
|
'letter': {},
|
|
|
|
|
|
}
|
|
|
|
|
|
})
|
|
|
|
|
|
assert isinstance(resp[0]['sms_counts'], dict)
|
|
|
|
|
|
assert isinstance(resp[0]['email_counts'], dict)
|
|
|
|
|
|
assert isinstance(resp[0]['letter_counts'], dict)
|
2016-07-28 18:09:17 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _stats(requested, delivered, failed):
|
|
|
|
|
|
return {'requested': requested, 'delivered': delivered, 'failed': failed}
|
2016-09-29 18:44:10 +01:00
|
|
|
|
|
|
|
|
|
|
|
2017-01-30 17:27:09 +00:00
|
|
|
|
@pytest.mark.parametrize('dict_in, expected_failed, expected_requested', [
|
|
|
|
|
|
(
|
|
|
|
|
|
{},
|
|
|
|
|
|
0,
|
|
|
|
|
|
0
|
|
|
|
|
|
),
|
|
|
|
|
|
(
|
|
|
|
|
|
{'temporary-failure': 1, 'permanent-failure': 1, 'technical-failure': 1},
|
|
|
|
|
|
3,
|
|
|
|
|
|
3,
|
|
|
|
|
|
),
|
|
|
|
|
|
(
|
|
|
|
|
|
{'created': 1, 'pending': 1, 'sending': 1, 'delivered': 1},
|
|
|
|
|
|
0,
|
|
|
|
|
|
4,
|
|
|
|
|
|
),
|
|
|
|
|
|
])
|
|
|
|
|
|
def test_aggregate_status_types(dict_in, expected_failed, expected_requested):
|
|
|
|
|
|
sms_counts = aggregate_status_types({'sms': dict_in})['sms_counts']
|
|
|
|
|
|
assert sms_counts['failed'] == expected_failed
|
|
|
|
|
|
assert sms_counts['requested'] == expected_requested
|
|
|
|
|
|
|
|
|
|
|
|
|
2016-09-29 18:44:10 +01:00
|
|
|
|
@pytest.mark.parametrize(
|
|
|
|
|
|
'now, expected_number_of_months', [
|
|
|
|
|
|
(freeze_time("2017-12-31 11:09:00.061258"), 12),
|
|
|
|
|
|
(freeze_time("2017-01-01 11:09:00.061258"), 10)
|
|
|
|
|
|
]
|
|
|
|
|
|
)
|
|
|
|
|
|
def test_get_free_paid_breakdown_for_billable_units(now, expected_number_of_months):
|
2017-10-31 11:22:57 +00:00
|
|
|
|
sms_allowance = 250000
|
2016-09-29 18:44:10 +01:00
|
|
|
|
with now:
|
2017-04-26 17:09:07 +01:00
|
|
|
|
billing_units = get_free_paid_breakdown_for_billable_units(
|
2017-10-31 11:22:57 +00:00
|
|
|
|
2016, sms_allowance, [
|
2017-04-26 17:09:07 +01:00
|
|
|
|
{
|
|
|
|
|
|
'month': 'April', 'international': False, 'rate_multiplier': 1,
|
|
|
|
|
|
'notification_type': 'sms', 'rate': 1.65, 'billing_units': 100000
|
|
|
|
|
|
},
|
|
|
|
|
|
{
|
|
|
|
|
|
'month': 'May', 'international': False, 'rate_multiplier': 1,
|
|
|
|
|
|
'notification_type': 'sms', 'rate': 1.65, 'billing_units': 100000
|
|
|
|
|
|
},
|
|
|
|
|
|
{
|
|
|
|
|
|
'month': 'June', 'international': False, 'rate_multiplier': 1,
|
|
|
|
|
|
'notification_type': 'sms', 'rate': 1.65, 'billing_units': 100000
|
|
|
|
|
|
},
|
|
|
|
|
|
{
|
|
|
|
|
|
'month': 'February', 'international': False, 'rate_multiplier': 1,
|
|
|
|
|
|
'notification_type': 'sms', 'rate': 1.65, 'billing_units': 2000
|
|
|
|
|
|
},
|
2017-04-26 17:08:33 +01:00
|
|
|
|
]
|
|
|
|
|
|
)
|
2017-04-26 17:09:07 +01:00
|
|
|
|
assert list(billing_units) == [
|
2017-12-19 14:35:10 +00:00
|
|
|
|
{'free': 100000, 'name': 'April', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
|
|
|
|
|
|
{'free': 100000, 'name': 'May', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
|
|
|
|
|
|
{'free': 50000, 'name': 'June', 'paid': 50000, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
|
|
|
|
|
|
{'free': 0, 'name': 'July', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
|
|
|
|
|
|
{'free': 0, 'name': 'August', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
|
|
|
|
|
|
{'free': 0, 'name': 'September', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
|
|
|
|
|
|
{'free': 0, 'name': 'October', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
|
|
|
|
|
|
{'free': 0, 'name': 'November', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
|
|
|
|
|
|
{'free': 0, 'name': 'December', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
|
|
|
|
|
|
{'free': 0, 'name': 'January', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
|
|
|
|
|
|
{'free': 0, 'name': 'February', 'paid': 2000, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
|
|
|
|
|
|
{'free': 0, 'name': 'March', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}
|
2017-04-26 17:09:07 +01:00
|
|
|
|
][:expected_number_of_months]
|
2017-04-26 17:08:33 +01:00
|
|
|
|
|
|
|
|
|
|
|
2017-03-16 14:46:27 +00:00
|
|
|
|
def test_format_template_stats_to_list_with_no_stats():
|
|
|
|
|
|
assert list(format_template_stats_to_list({})) == []
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_format_template_stats_to_list():
|
|
|
|
|
|
counts = {
|
|
|
|
|
|
'created': 1,
|
|
|
|
|
|
'pending': 1,
|
|
|
|
|
|
'delivered': 1,
|
|
|
|
|
|
'failed': 1,
|
|
|
|
|
|
'temporary-failure': 1,
|
|
|
|
|
|
'permanent-failure': 1,
|
|
|
|
|
|
'technical-failure': 1,
|
|
|
|
|
|
'do-not-count': 999,
|
|
|
|
|
|
}
|
|
|
|
|
|
stats_list = list(format_template_stats_to_list({
|
|
|
|
|
|
'template_2_id': {
|
|
|
|
|
|
'counts': {},
|
|
|
|
|
|
'name': 'bar',
|
|
|
|
|
|
},
|
|
|
|
|
|
'template_1_id': {
|
|
|
|
|
|
'counts': counts,
|
|
|
|
|
|
'name': 'foo',
|
|
|
|
|
|
},
|
|
|
|
|
|
}))
|
|
|
|
|
|
|
|
|
|
|
|
# we don’t care about the order of this function’s output
|
|
|
|
|
|
assert len(stats_list) == 2
|
|
|
|
|
|
assert {
|
|
|
|
|
|
'counts': counts,
|
|
|
|
|
|
'name': 'foo',
|
|
|
|
|
|
'requested_count': 7,
|
2017-03-20 17:35:01 +00:00
|
|
|
|
'id': 'template_1_id',
|
2017-03-16 14:46:27 +00:00
|
|
|
|
} in stats_list
|
|
|
|
|
|
assert {
|
|
|
|
|
|
'counts': {},
|
|
|
|
|
|
'name': 'bar',
|
|
|
|
|
|
'requested_count': 0,
|
2017-03-20 17:35:01 +00:00
|
|
|
|
'id': 'template_2_id',
|
2017-03-16 14:46:27 +00:00
|
|
|
|
} in stats_list
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_get_tuples_of_financial_years():
|
|
|
|
|
|
assert list(get_tuples_of_financial_years(
|
|
|
|
|
|
lambda year: 'http://example.com?year={}'.format(year),
|
|
|
|
|
|
start=2040,
|
|
|
|
|
|
end=2041,
|
|
|
|
|
|
)) == [
|
|
|
|
|
|
('financial year', 2040, 'http://example.com?year=2040', '2040 to 2041'),
|
|
|
|
|
|
('financial year', 2041, 'http://example.com?year=2041', '2041 to 2042'),
|
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_get_tuples_of_financial_years_defaults_to_2015():
|
|
|
|
|
|
assert 2015 in list(get_tuples_of_financial_years(
|
|
|
|
|
|
lambda year: 'http://example.com?year={}'.format(year),
|
|
|
|
|
|
end=2040,
|
|
|
|
|
|
))[0]
|
2017-04-07 11:08:40 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@freeze_time("2016-01-01 11:09:00.061258")
|
|
|
|
|
|
def test_should_show_all_jobs_with_valid_statuses(
|
|
|
|
|
|
logged_in_client,
|
|
|
|
|
|
mock_get_template_statistics,
|
2018-05-09 13:53:02 +01:00
|
|
|
|
mock_get_service_statistics,
|
2017-06-05 14:48:24 +01:00
|
|
|
|
mock_get_service_templates_when_no_templates_exist,
|
2017-04-07 11:08:40 +01:00
|
|
|
|
mock_get_jobs,
|
|
|
|
|
|
mock_get_usage,
|
2017-08-23 17:07:42 +01:00
|
|
|
|
mock_get_inbound_sms_summary
|
2017-04-07 11:08:40 +01:00
|
|
|
|
):
|
2017-06-05 14:48:24 +01:00
|
|
|
|
logged_in_client.get(url_for('main.service_dashboard', service_id=SERVICE_ONE_ID))
|
2017-04-07 11:08:40 +01:00
|
|
|
|
|
|
|
|
|
|
first_call = mock_get_jobs.call_args_list[0]
|
2018-07-20 10:18:51 +01:00
|
|
|
|
# first call - checking for any jobs
|
|
|
|
|
|
assert first_call == call(SERVICE_ONE_ID)
|
2017-04-07 11:08:40 +01:00
|
|
|
|
second_call = mock_get_jobs.call_args_list[1]
|
2018-07-20 10:18:51 +01:00
|
|
|
|
# second call - scheduled jobs only
|
|
|
|
|
|
assert second_call == call(SERVICE_ONE_ID, statuses=['scheduled'])
|
|
|
|
|
|
# third call - everything but scheduled and cancelled
|
|
|
|
|
|
third_call = mock_get_jobs.call_args_list[2]
|
|
|
|
|
|
assert third_call == call(SERVICE_ONE_ID, limit_days=7, statuses={
|
2017-04-07 11:08:40 +01:00
|
|
|
|
'pending',
|
|
|
|
|
|
'in progress',
|
|
|
|
|
|
'finished',
|
|
|
|
|
|
'sending limits exceeded',
|
|
|
|
|
|
'ready to send',
|
|
|
|
|
|
'sent to dvla'
|
|
|
|
|
|
})
|