Revert "Revert "Restyle template statistics and received text messages""

This commit is contained in:
Chris Hill-Scott
2020-02-18 16:16:51 +00:00
committed by GitHub
parent a8ca8c1835
commit 3bbd5381c6
15 changed files with 186 additions and 114 deletions

View File

@@ -222,11 +222,11 @@ def test_inbound_messages_shows_count_of_messages_when_there_are_messages(
'main.service_dashboard',
service_id=SERVICE_ONE_ID,
)
banner = page.select_one('a.banner-dashboard')
assert normalize_spaces(
page.select('.big-number-meta-wrapper')[0].text
) == '99 text messages received latest message just now'
assert page.select('.big-number-meta-wrapper a')[0]['href'] == url_for(
banner.text
) == '9,999 text messages received latest message just now'
assert banner['href'] == url_for(
'main.inbox', service_id=SERVICE_ONE_ID
)
@@ -248,9 +248,9 @@ def test_inbound_messages_shows_count_of_messages_when_there_are_no_messages(
'main.service_dashboard',
service_id=SERVICE_ONE_ID,
)
assert normalize_spaces(page.select('.big-number-meta-wrapper')[0].text) == '0 text messages received'
assert page.select('.big-number-meta-wrapper a')[0]['href'] == url_for(
banner = page.select_one('a.banner-dashboard')
assert normalize_spaces(banner.text) == '0 text messages received'
assert banner['href'] == url_for(
'main.inbox', service_id=SERVICE_ONE_ID
)
@@ -553,7 +553,7 @@ def test_should_not_show_recent_templates_on_dashboard_if_only_one_template_used
expected_count = stats[0]['count']
assert expected_count == 50
assert normalize_spaces(
page.select_one('#total-sms .big-number').text
page.select_one('#total-sms .big-number-smaller').text
) == (
'{} text messages sent'.format(expected_count)
)
@@ -713,14 +713,13 @@ def test_should_show_upcoming_jobs_on_dashboard(
['email', 'sms'],
['email', 'sms', 'letter'],
))
@pytest.mark.parametrize('totals, big_number_class', [
@pytest.mark.parametrize('totals', [
(
{
'email': {'requested': 0, 'delivered': 0, 'failed': 0},
'sms': {'requested': 99999, 'delivered': 0, 'failed': 0},
'letter': {'requested': 99999, 'delivered': 0, 'failed': 0}
},
'.big-number',
),
(
{
@@ -728,7 +727,6 @@ def test_should_show_upcoming_jobs_on_dashboard(
'sms': {'requested': 0, 'delivered': 0, 'failed': 0},
'letter': {'requested': 100000, 'delivered': 0, 'failed': 0},
},
'.big-number-smaller',
),
])
def test_correct_font_size_for_big_numbers(
@@ -743,7 +741,6 @@ def test_correct_font_size_for_big_numbers(
service_one,
permissions,
totals,
big_number_class,
):
service_one['permissions'] = permissions
@@ -758,11 +755,12 @@ def test_correct_font_size_for_big_numbers(
service_id=service_one['id'],
)
assert len(page.select_one('[data-key=totals]').select('.column-third')) == 3
assert len(page.select_one('[data-key=usage]').select('.column-third')) == 3
assert len(
page.select('.big-number-with-status {}'.format(big_number_class))
assert (
len(page.select_one('[data-key=totals]').select('.column-third'))
) == (
len(page.select_one('[data-key=usage]').select('.column-third'))
) == (
len(page.select('.big-number-with-status .big-number-smaller'))
) == 3

View File

@@ -1960,7 +1960,7 @@ def mock_get_inbound_sms_summary(mocker):
service_id,
):
return {
'count': 99,
'count': 9999,
'most_recent': datetime.utcnow().isoformat()
}