Revert "Convert all links to govuk frontend"

This commit is contained in:
Tom Byers
2020-02-24 11:56:38 +00:00
committed by GitHub
parent ae1b2d4c63
commit 5b306dde4d
163 changed files with 548 additions and 521 deletions

View File

@@ -43,7 +43,7 @@ def test_organisation_page_shows_all_organisations(
expected_hints = ('0 live services', '1 live service', '2 live services')
for index, org in enumerate(orgs):
assert page.select('.browse-list-item a')[index].text == org['name']
assert page.select('a.browse-list-link')[index].text == org['name']
if not org['active']:
assert page.select_one('.table-field-status-default,heading-medium').text == '- archived'
assert normalize_spaces(page.select('.browse-list-hint')[index].text) == (

View File

@@ -28,7 +28,7 @@ class _MockS3Object():
partial(url_for, 'main.request_to_go_live', service_id=SERVICE_ONE_ID),
),
(
['govuk-link', 'govuk-link--no-visited-state'],
[],
partial(url_for, 'main.service_download_agreement', service_id=SERVICE_ONE_ID),
),
]
@@ -41,7 +41,7 @@ class _MockS3Object():
partial(url_for, 'main.request_to_go_live', service_id=SERVICE_ONE_ID),
),
(
['govuk-link', 'govuk-link--no-visited-state'],
[],
partial(url_for, 'main.service_download_agreement', service_id=SERVICE_ONE_ID),
),
(
@@ -58,7 +58,7 @@ class _MockS3Object():
partial(url_for, 'main.request_to_go_live', service_id=SERVICE_ONE_ID),
),
(
['govuk-link', 'govuk-link--no-visited-state'],
[],
partial(url_for, 'main.service_download_agreement', service_id=SERVICE_ONE_ID),
),
(
@@ -75,7 +75,7 @@ class _MockS3Object():
partial(url_for, 'main.request_to_go_live', service_id=SERVICE_ONE_ID),
),
(
['govuk-link', 'govuk-link--no-visited-state'],
[],
partial(url_for, 'main.support'),
),
]

View File

@@ -25,7 +25,7 @@ def test_find_services_by_name_displays_services_found(
_expected_status=200
)
get_services.assert_called_once_with(service_name="Test Service")
result = document.select_one('.browse-list-item a')
result = document.find('a', {'class': 'browse-list-link'})
assert result.text.strip() == 'Test Service'
assert result.attrs["href"] == "/services/1234"
@@ -42,7 +42,7 @@ def test_find_services_by_name_displays_multiple_services(
)
document = client_request.post('main.find_services_by_name', _data={"search": "Tadfield"}, _expected_status=200)
results = document.select('.browse-list-item a')
results = document.findAll('a', {'class': 'browse-list-link'})
assert len(results) == 2
assert sorted([result.text.strip() for result in results]) == ["Tadfield Air Base", "Tadfield Police"]

View File

@@ -550,7 +550,7 @@ def test_cant_edit_user_folder_permissions_for_platform_admin_users(
service_id=SERVICE_ONE_ID,
user_id=platform_admin_user['id'],
)
assert normalize_spaces(page.select('main p')[0].text) == 'platform@admin.gov.uk Change email address'
assert normalize_spaces(page.select('main p')[0].text) == 'platform@admin.gov.uk Change'
assert normalize_spaces(page.select('main p')[2].text) == (
'Platform admin users can access all template folders.'
)

View File

@@ -263,7 +263,7 @@ def test_non_gov_user_cannot_see_change_email_link(
):
client_request.login(api_nongov_user_active)
page = client_request.get('main.user_profile')
assert not page.find('a', {'href': url_for('main.user_profile_email')})
assert '<a href="/user-profile/email">' not in str(page)
assert page.select_one('h1').text.strip() == 'Your profile'