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

Merge pull request #3024 from alphagov/style-org-breadcrumb

Browse Source 
Adjust type and spacing to accommodate organisation breadcrumb
This commit is contained in:
Chris Hill-Scott
2019-07-04 16:38:47 +01:00
committed by GitHub
parent dff20485b3 7901d08781
commit c709d7668e
18 changed files with 232 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1346,7 +1346,7 @@ def test_org_breadcrumbs_do_not_show_if_service_has_no_org(
):
page = client_request.get('main.service_dashboard', service_id=SERVICE_ONE_ID)
assert not page.select('.navigation-breadcrumb')
assert not page.select('.navigation-organisation-link')
def test_org_breadcrumbs_do_not_show_if_user_is_not_an_org_member(
@@ -1369,7 +1369,7 @@ def test_org_breadcrumbs_do_not_show_if_user_is_not_an_org_member(
client_request.login(active_caseworking_user, service=service_one_json)
page = client_request.get('main.service_dashboard', service_id=SERVICE_ONE_ID, _follow_redirects=True)
assert not page.select('.navigation-breadcrumb')
assert not page.select('.navigation-organisation-link')
def test_org_breadcrumbs_show_if_user_is_a_member_of_the_services_org(
@@ -1391,8 +1391,10 @@ def test_org_breadcrumbs_show_if_user_is_a_member_of_the_services_org(
mocker.patch('app.models.service.Organisation')
page = client_request.get('main.service_dashboard', service_id=SERVICE_ONE_ID)
assert page.select('.navigation-breadcrumb')
assert page.select_one('.navigation-organisation-link')['href'] == url_for(
'main.organisation_dashboard',
org_id=ORGANISATION_ID,
)
def test_org_breadcrumbs_do_not_show_if_user_is_a_member_of_the_services_org_but_service_is_in_trial_mode(
@@ -1435,4 +1437,7 @@ def test_org_breadcrumbs_show_if_user_is_platform_admin(
response = logged_in_platform_admin_client.get(url_for('main.service_dashboard', service_id=SERVICE_ONE_ID))
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert page.select('.navigation-breadcrumb')
assert page.select_one('.navigation-organisation-link')['href'] == url_for(
'main.organisation_dashboard',
org_id=ORGANISATION_ID,
)

71
tests/app/main/views/test_template_folders.py
View File

@@ -55,11 +55,11 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
['Email', 'Text message', 'Letter'],
[
'folder_one 2 folders',
'folder_one / folder_one_one 1 template, 1 folder',
'folder_one / folder_one_one / folder_one_one_one 1 template',
'folder_one / folder_one_one / folder_one_one_one / sms_template_nested Text message template',
'folder_one / folder_one_one / letter_template_nested Letter template',
'folder_one / folder_one_two Empty',
'folder_one folder_one_one 1 template, 1 folder',
'folder_one folder_one_one folder_one_one_one 1 template',
'folder_one folder_one_one folder_one_one_one sms_template_nested Text message template',
'folder_one folder_one_one letter_template_nested Letter template',
'folder_one folder_one_two Empty',
'folder_two Empty',
'sms_template_one Text message template',
'sms_template_two Text message template',
@@ -103,9 +103,9 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
['All', 'Email', 'Letter'],
[
'folder_one 1 folder',
'folder_one / folder_one_one 1 folder',
'folder_one / folder_one_one / folder_one_one_one 1 template',
'folder_one / folder_one_one / folder_one_one_one / sms_template_nested Text message template',
'folder_one folder_one_one 1 folder',
'folder_one folder_one_one folder_one_one_one 1 template',
'folder_one folder_one_one folder_one_one_one sms_template_nested Text message template',
'sms_template_one Text message template',
'sms_template_two Text message template',
],
@@ -126,15 +126,15 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
),
(
'folder_one – Templates – service one – GOV.UK Notify',
'Templates / folder_one',
'Templates folder_one',
[{'template_type': 'all'}],
{'template_folder_id': PARENT_FOLDER_ID},
['Email', 'Text message', 'Letter'],
[
'folder_one_one 1 template, 1 folder',
'folder_one_one / folder_one_one_one 1 template',
'folder_one_one / folder_one_one_one / sms_template_nested Text message template',
'folder_one_one / letter_template_nested Letter template',
'folder_one_one folder_one_one_one 1 template',
'folder_one_one folder_one_one_one sms_template_nested Text message template',
'folder_one_one letter_template_nested Letter template',
'folder_one_two Empty',
],
[
@@ -152,14 +152,14 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
),
(
'folder_one – Templates – service one – GOV.UK Notify',
'Templates / folder_one',
'Templates folder_one',
[{'template_type': 'sms'}],
{'template_type': 'sms', 'template_folder_id': PARENT_FOLDER_ID},
['All', 'Email', 'Letter'],
[
'folder_one_one 1 folder',
'folder_one_one / folder_one_one_one 1 template',
'folder_one_one / folder_one_one_one / sms_template_nested Text message template',
'folder_one_one folder_one_one_one 1 template',
'folder_one_one folder_one_one_one sms_template_nested Text message template',
],
[
'folder_one_one 1 folder',
@@ -173,7 +173,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
),
(
'folder_one – Templates – service one – GOV.UK Notify',
'Templates / folder_one',
'Templates folder_one',
[{'template_type': 'email'}],
{'template_type': 'email', 'template_folder_id': PARENT_FOLDER_ID},
['All', 'Text message', 'Letter'],
@@ -184,7 +184,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
),
(
'folder_one_one – folder_one – Templates – service one – GOV.UK Notify',
'Templates / folder_one / folder_one_one',
'Templates folder_one folder_one_one',
[
{'template_type': 'all'},
{'template_type': 'all', 'template_folder_id': PARENT_FOLDER_ID},
@@ -193,7 +193,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
['Email', 'Text message', 'Letter'],
[
'folder_one_one_one 1 template',
'folder_one_one_one / sms_template_nested Text message template',
'folder_one_one_one sms_template_nested Text message template',
'letter_template_nested Letter template',
],
[
@@ -209,7 +209,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
),
(
'folder_one_one_one – folder_one_one – folder_one – Templates – service one – GOV.UK Notify',
'Templates / folder_one / folder_one_one / folder_one_one_one',
'Templates folder_one folder_one_one folder_one_one_one',
[
{'template_type': 'all'},
{'template_type': 'all', 'template_folder_id': PARENT_FOLDER_ID},
@@ -230,7 +230,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
),
(
'folder_one_one_one – folder_one_one – folder_one – Templates – service one – GOV.UK Notify',
'Templates / folder_one / folder_one_one / folder_one_one_one',
'Templates folder_one folder_one_one folder_one_one_one',
[
{'template_type': 'email'},
{'template_type': 'email', 'template_folder_id': PARENT_FOLDER_ID},
@@ -248,7 +248,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
),
(
'folder_two – Templates – service one – GOV.UK Notify',
'Templates / folder_two',
'Templates folder_two',
[{'template_type': 'all'}],
{'template_folder_id': FOLDER_TWO_ID},
['Email', 'Text message', 'Letter'],
@@ -259,7 +259,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
),
(
'folder_two – Templates – service one – GOV.UK Notify',
'Templates / folder_two',
'Templates folder_two',
[{'template_type': 'sms'}],
{'template_folder_id': FOLDER_TWO_ID, 'template_type': 'sms'},
['All', 'Email', 'Letter'],
@@ -1405,17 +1405,17 @@ def test_show_custom_error_message(
{},
[
['folder_A', '1 template, 2 folders'],
['folder_E / folder_F / folder_G', '1 template'],
['folder_E folder_F folder_G', '1 template'],
['email_template_root', 'Email template'],
],
[
['folder_A', '1 template, 2 folders'],
['folder_A', '/', 'folder_C', '1 template'],
['folder_A', '/', 'folder_C', '/', 'sms_template_C', 'Text message template'],
['folder_A', '/', 'folder_D', 'Empty'],
['folder_A', '/', 'sms_template_A', 'Text message template'],
['folder_E / folder_F / folder_G', '1 template'],
['folder_E / folder_F / folder_G', '/', 'email_template_G', 'Email template'],
['folder_A', 'folder_C', '1 template'],
['folder_A', 'folder_C', 'sms_template_C', 'Text message template'],
['folder_A', 'folder_D', 'Empty'],
['folder_A', 'sms_template_A', 'Text message template'],
['folder_E folder_F folder_G', '1 template'],
['folder_E folder_F folder_G', 'email_template_G', 'Email template'],
['email_template_root', 'Email template'],
],
None,
@@ -1423,12 +1423,12 @@ def test_show_custom_error_message(
(
{'template_type': 'email'},
[
['folder_E / folder_F / folder_G', '1 template'],
['folder_E folder_F folder_G', '1 template'],
['email_template_root', 'Email template'],
],
[
['folder_E / folder_F / folder_G', '1 template'],
['folder_E / folder_F / folder_G', '/', 'email_template_G', 'Email template'],
['folder_E folder_F folder_G', '1 template'],
['folder_E folder_F folder_G', 'email_template_G', 'Email template'],
['email_template_root', 'Email template'],
],
None,
@@ -1440,9 +1440,9 @@ def test_show_custom_error_message(
],
[
['folder_A', '1 template, 1 folder'],
['folder_A', '/', 'folder_C', '1 template'],
['folder_A', '/', 'folder_C', '/', 'sms_template_C', 'Text message template'],
['folder_A', '/', 'sms_template_A', 'Text message template'],
['folder_A', 'folder_C', '1 template'],
['folder_A', 'folder_C', 'sms_template_C', 'Text message template'],
['folder_A', 'sms_template_A', 'Text message template'],
],
None,
),
@@ -1521,7 +1521,6 @@ def test_should_filter_templates_folder_page_based_on_user_permissions(
and 'template-list-item' in tag['class']
and 'template-list-item-hidden-by-default' not in tag['class']
))
assert [
[i.strip() for i in e.text.split("\n") if i.strip()]
for e in displayed_page_items

32
tests/app/main/views/test_templates.py
View File

@@ -428,7 +428,7 @@ def test_user_with_only_send_and_view_sees_letter_page(
_test_page_title=False,
)
assert normalize_spaces(page.select_one('h1').text) == (
'Templates / Two week reminder'
'Templates Two week reminder'
)
assert normalize_spaces(page.select_one('title').text) == (
'Two week reminder – Templates – service one – GOV.UK Notify'
@@ -624,7 +624,7 @@ def test_should_be_able_to_view_a_template_with_links(
)
assert normalize_spaces(page.select_one('h1').text) == (
'Templates / Two week reminder'
'Templates Two week reminder'
)
assert normalize_spaces(page.select_one('title').text) == (
'Two week reminder – Templates – service one – GOV.UK Notify'
@@ -855,27 +855,27 @@ def test_choose_a_template_to_copy(
'6 templates'
),
(
'Service 1 / sms_template_one '
'Service 1 sms_template_one '
'Text message template'
),
(
'Service 1 / sms_template_two '
'Service 1 sms_template_two '
'Text message template'
),
(
'Service 1 / email_template_one '
'Service 1 email_template_one '
'Email template'
),
(
'Service 1 / email_template_two '
'Service 1 email_template_two '
'Email template'
),
(
'Service 1 / letter_template_one '
'Service 1 letter_template_one '
'Letter template'
),
(
'Service 1 / letter_template_two '
'Service 1 letter_template_two '
'Letter template'
),
(
@@ -883,27 +883,27 @@ def test_choose_a_template_to_copy(
'6 templates'
),
(
'Service 2 / sms_template_one '
'Service 2 sms_template_one '
'Text message template'
),
(
'Service 2 / sms_template_two '
'Service 2 sms_template_two '
'Text message template'
),
(
'Service 2 / email_template_one '
'Service 2 email_template_one '
'Email template'
),
(
'Service 2 / email_template_two '
'Service 2 email_template_two '
'Email template'
),
(
'Service 2 / letter_template_one '
'Service 2 letter_template_one '
'Letter template'
),
(
'Service 2 / letter_template_two '
'Service 2 letter_template_two '
'Letter template'
),
]
@@ -1026,7 +1026,7 @@ def test_choose_a_template_to_copy_from_folder_within_service(
)
assert normalize_spaces(page.select_one('.folder-heading').text) == (
'service one / Parent folder'
'service one Parent folder'
)
breadcrumb_links = page.select('.folder-heading a')
assert len(breadcrumb_links) == 1
@@ -1046,7 +1046,7 @@ def test_choose_a_template_to_copy_from_folder_within_service(
'1 template'
),
(
'Child folder non-empty / Should appear in list (nested) '
'Child folder non-empty Should appear in list (nested) '
'Text message template'
),
(

10
tests/app/models/test_service.py
View File

@@ -80,13 +80,13 @@ def test_get_user_template_folders_only_returns_folders_visible_to_user(
result = service.get_user_template_folders(User(active_user_with_permissions))
assert result == [
{
'name': "Parent 1 - invisible / 1's Visible child",
'name': ["Parent 1 - invisible", "1's Visible child"],
'id': mocker.ANY,
'parent_id': None,
'users_with_permission': [active_user_with_permissions['id']],
},
{
'name': "Parent 1 - invisible / 1's Invisible child / 1's Visible grandchild",
'name': ["Parent 1 - invisible", ["1's Invisible child", "1's Visible grandchild"]],
'id': mocker.ANY,
'parent_id': None,
'users_with_permission': [active_user_with_permissions['id']],
@@ -98,7 +98,7 @@ def test_get_user_template_folders_only_returns_folders_visible_to_user(
'users_with_permission': [active_user_with_permissions['id']],
},
{
'name': "2's Invisible child / 2's Visible grandchild",
'name': ["2's Invisible child", "2's Visible grandchild"],
'id': mocker.ANY,
'parent_id': VIS_PARENT_FOLDER_ID,
'users_with_permission': [active_user_with_permissions['id']],
@@ -124,13 +124,13 @@ def test_get_template_folders_shows_user_folders_when_user_id_passed_in(
result = service.get_template_folders(user=User(active_user_with_permissions))
assert result == [
{
'name': "Parent 1 - invisible / 1's Visible child",
'name': ["Parent 1 - invisible", "1's Visible child"],
'id': mocker.ANY,
'parent_id': None,
'users_with_permission': [active_user_with_permissions['id']]
},
{
'name': "Parent 1 - invisible / 1's Invisible child / 1's Visible grandchild",
'name': ["Parent 1 - invisible", ["1's Invisible child", "1's Visible grandchild"]],
'id': mocker.ANY,
'parent_id': None,
'users_with_permission': [active_user_with_permissions['id']]