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

Merge pull request #2931 from alphagov/rationalise-settings

Browse Source 
Allow more space for values in settings tables
This commit is contained in:
Chris Hill-Scott
2019-04-29 16:58:24 +01:00
committed by GitHub
parent 68f5b58f9d 0512f40ad3
commit 0f2f9fa946
7 changed files with 171 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/app/main/views/service_settings/test_service_setting_permissions.py
View File

@@ -92,16 +92,29 @@ def test_service_setting_toggles_show(get_service_settings_page, service_one, se
assert normalize_spaces(page.find('a', {'href': button_url}).find_parent('tr').text.strip()) == text
@pytest.mark.parametrize('service_fields, endpoint, kwargs, text', [
({'active': True}, '.archive_service', {}, 'Archive service'),
({'active': True}, '.suspend_service', {}, 'Suspend service'),
({'active': False}, '.resume_service', {}, 'Resume service'),
@pytest.mark.parametrize('service_fields, endpoint, index, text', [
({'active': True}, '.archive_service', 0, 'Archive service'),
({'active': True}, '.suspend_service', 1, 'Suspend service'),
({'active': False}, '.resume_service', 0, 'Resume service'),
pytest.param(
{'active': False}, '.archive_service', 1, 'Resume service',
marks=pytest.mark.xfail(raises=IndexError)
)
])
def test_service_setting_button_toggles(get_service_settings_page, service_one, service_fields, endpoint, kwargs, text):
button_url = url_for(endpoint, **kwargs, service_id=service_one['id'])
def test_service_setting_button_toggles(
get_service_settings_page,
service_one,
service_fields,
endpoint,
index,
text,
):
button_url = url_for(endpoint, service_id=service_one['id'])
service_one.update(service_fields)
page = get_service_settings_page()
assert normalize_spaces(page.find('a', {'class': 'button', 'href': button_url}).text.strip()) == text
link = page.select('.page-footer-delete-link a')[index]
assert normalize_spaces(link.text) == text
assert link['href'] == button_url
@pytest.mark.parametrize('permissions,permissions_text,visible', [

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

@@ -569,7 +569,7 @@ def test_monthly_shows_letters_in_breakdown(
service_id=service_one['id']
)
columns = page.select('.table-field-center-aligned .big-number-label')
columns = page.select('.table-field-left-aligned .big-number-label')
assert normalize_spaces(columns[0].text) == 'emails'
assert normalize_spaces(columns[1].text) == 'text messages'

24
tests/app/main/views/test_send.py
View File

@@ -656,12 +656,12 @@ def test_upload_valid_csv_shows_preview_and_table(
for row_index, row in enumerate([
(
'<td class="table-field-center-aligned"> <div class=""> 07700900001 </div> </td>',
'<td class="table-field-center-aligned"> <div class=""> A </div> </td>',
'<td class="table-field-left-aligned"> <div class=""> 07700900001 </div> </td>',
'<td class="table-field-left-aligned"> <div class=""> A </div> </td>',
(
'<td class="table-field-center-aligned"> '
'<td class="table-field-left-aligned"> '
'<div class="table-field-status-default"> '
'<ul class="list list-bullet"> '
'<ul> '
'<li>foo</li> <li>foo</li> <li>foo</li> '
'</ul> '
'</div> '
@@ -669,12 +669,12 @@ def test_upload_valid_csv_shows_preview_and_table(
)
),
(
'<td class="table-field-center-aligned"> <div class=""> 07700900002 </div> </td>',
'<td class="table-field-center-aligned"> <div class=""> B </div> </td>',
'<td class="table-field-left-aligned"> <div class=""> 07700900002 </div> </td>',
'<td class="table-field-left-aligned"> <div class=""> B </div> </td>',
(
'<td class="table-field-center-aligned"> '
'<td class="table-field-left-aligned"> '
'<div class="table-field-status-default"> '
'<ul class="list list-bullet"> '
'<ul> '
'<li>foo</li> <li>foo</li> <li>foo</li> '
'</ul> '
'</div> '
@@ -682,12 +682,12 @@ def test_upload_valid_csv_shows_preview_and_table(
)
),
(
'<td class="table-field-center-aligned"> <div class=""> 07700900003 </div> </td>',
'<td class="table-field-center-aligned"> <div class=""> C </div> </td>',
'<td class="table-field-left-aligned"> <div class=""> 07700900003 </div> </td>',
'<td class="table-field-left-aligned"> <div class=""> C </div> </td>',
(
'<td class="table-field-center-aligned"> '
'<td class="table-field-left-aligned"> '
'<div class="table-field-status-default"> '
'<ul class="list list-bullet"> '
'<ul> '
'<li>foo</li> <li>foo</li> '
'</ul> '
'</div> '