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

Merge pull request #3165 from alphagov/letters-always-on-usage

Browse Source 
Always show letters on the dashboard and usage page
This commit is contained in:
Chris Hill-Scott
2019-11-04 14:49:47 +00:00
committed by GitHub
parent 6c5255f30b 220da2e5be
commit 8782049548
6 changed files with 74 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -684,71 +684,26 @@ def test_should_show_upcoming_jobs_on_dashboard(
assert table_rows[1].find_all('td')[0].text.strip() == '1'
@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,
mock_get_service_statistics,
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
@pytest.mark.parametrize('permissions, totals, big_number_class, expected_column_count', [
@pytest.mark.parametrize('permissions', (
['email', 'sms'],
['email', 'sms', 'letter'],
))
@pytest.mark.parametrize('totals, big_number_class', [
(
['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(
@@ -762,7 +717,6 @@ def test_correct_font_size_for_big_numbers(
permissions,
totals,
big_number_class,
expected_column_count,
):
service_one['permissions'] = permissions
@@ -777,9 +731,11 @@ def test_correct_font_size_for_big_numbers(
service_id=service_one['id'],
)
assert expected_column_count == len(
assert len(page.select('.column-third')) == 3
assert len(
page.select('.big-number-with-status {}'.format(big_number_class))
)
) == 3
@freeze_time("2016-01-01 11:09:00.061258")
@@ -834,7 +790,7 @@ def test_usage_page(
mock_get_usage.assert_called_once_with(SERVICE_ONE_ID, 2011)
mock_get_free_sms_fragment_limit.assert_called_with(SERVICE_ONE_ID, 2011)
cols = page.find_all('div', {'class': 'column-half'})
cols = page.find_all('div', {'class': 'column-one-third'})
nav = page.find('ul', {'class': 'pill', 'role': 'tablist'})
nav_links = nav.find_all('a')
@@ -852,7 +808,7 @@ def test_usage_page(
assert 'April' in table
assert 'February' in table
assert 'March' in table
assert '£15.84' in table
assert '£20.59' in table
assert '140 free text messages' in table
assert '£20.30' in table
assert '1,230 text messages at 1.65p' in table