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 branch '2135-send-message-flow-h1-changes' of https://github.com/GSA/notifications-admin into 2135-send-message-flow-h1-changes

Browse Source 
# Conflicts:
#	app/templates/views/templates/template.html
This commit is contained in:
Jonathan Bobel
2024-12-04 10:18:26 -05:00
parent b75d7dcd12 02bffa8c12
commit 30c249718d
7 changed files with 46 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -269,7 +269,7 @@ def test_invite_goes_in_session(
("user", "landing_page_title"),
[
(create_active_user_with_permissions(), "Dashboard"),
(create_active_caseworking_user(), "Templates"),
(create_active_caseworking_user(), "Select or create a template"),
],
)
def test_accepting_invite_removes_invite_from_session(

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

@@ -159,8 +159,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
None,
),
(
"folder_one – Select or create a template – service one – Notify.gov",
"Templates folder_one",
"Select or create a template – service one – Notify.gov",
"Select or create a template",
[{"template_type": "all"}],
{"template_folder_id": PARENT_FOLDER_ID},
["Email", "Text message"],
@@ -182,8 +182,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
None,
),
(
"folder_one – Select or create a template – service one – Notify.gov",
"Templates folder_one",
"Select or create a template – service one – Notify.gov",
"Select or create a template",
[{"template_type": "sms"}],
{"template_type": "sms", "template_folder_id": PARENT_FOLDER_ID},
["All", "Email"],
@@ -199,8 +199,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
None,
),
(
"folder_one – Select or create a template – service one – Notify.gov",
"Templates folder_one",
"Select or create a template – service one – Notify.gov",
"Select or create a template",
[{"template_type": "email"}],
{"template_type": "email", "template_folder_id": PARENT_FOLDER_ID},
["All", "Text message"],
@@ -210,8 +210,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
"There are no email templates in this folder",
),
(
"folder_one_one – folder_one – Select or create a template – service one – Notify.gov",
"Templates folder_one folder_one_one",
"Select or create a template – service one – Notify.gov",
"Select or create a template",
[
{"template_type": "all"},
{"template_type": "all", "template_folder_id": PARENT_FOLDER_ID},
@@ -229,8 +229,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
None,
),
(
"folder_one_one_one – folder_one_one – folder_one – Select or create a template – service one – Notify.gov",
"Templates folder_one folder_one_one folder_one_one_one",
"Select or create a template – service one – Notify.gov",
"Select or create a template",
[
{"template_type": "all"},
{"template_type": "all", "template_folder_id": PARENT_FOLDER_ID},
@@ -250,8 +250,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
None,
),
(
"folder_one_one_one – folder_one_one – folder_one – Select or create a template – service one – Notify.gov",
"Templates folder_one folder_one_one folder_one_one_one",
"Select or create a template – service one – Notify.gov",
"Select or create a template",
[
{"template_type": "email"},
{"template_type": "email", "template_folder_id": PARENT_FOLDER_ID},
@@ -268,8 +268,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
"There are no email templates in this folder",
),
(
"folder_two – Select or create a template – service one – Notify.gov",
"Select or create a template folder_two",
"Select or create a template – service one – Notify.gov",
"Select or create a template",
[{"template_type": "all"}],
{"template_folder_id": FOLDER_TWO_ID},
["Email", "Text message"],
@@ -279,8 +279,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
"This folder is empty",
),
(
"folder_two – Select or create a template – service one – Notify.gov",
"Select or create a template folder_two",
"Select or create a template – service one – Notify.gov",
"Select or create a template",
[{"template_type": "sms"}],
{"template_folder_id": FOLDER_TWO_ID, "template_type": "sms"},
["All", "Email"],
@@ -290,8 +290,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
"This folder is empty",
),
(
"folder_two – Select or create a template – service one – Notify.gov",
"Select or create a template folder_two",
"Select or create a template – service one – Notify.gov",
"Select or create a template",
[{"template_type": "all"}],
{"template_folder_id": FOLDER_TWO_ID, "template_type": "all"},
["Email", "Text message"],
@@ -346,13 +346,13 @@ def test_should_show_templates_folder_page(
**extra_args,
)
assert normalize_spaces(page.select_one("title").text) == expected_page_title
assert normalize_spaces(page.select_one("h1").text) == expected_title_tag
assert len(page.select("h2 a")) == len(expected_parent_link_args)
# remove this line if you don't want the breadcrumb on the first page
assert len(page.select("nav#breadcrumb-template-folders a")) == len(expected_parent_link_args)
for index, parent_link in enumerate(page.select("h2 a")):
for index, parent_link in enumerate(page.select("nav#breadcrumb-template-folders a")):
assert parent_link["href"] == url_for(
"main.choose_template",
service_id=SERVICE_ONE_ID,
@@ -530,7 +530,7 @@ def test_get_manage_folder_page(
_test_page_title=False,
)
assert normalize_spaces(page.select_one("title").text) == (
"folder_two – Select or create a template – service one – Notify.gov"
"Select or create a template – service one – Notify.gov"
)
assert page.select_one("input[name=name]")["value"] == "folder_two"
delete_link = page.find("a", string="Delete this folder")
@@ -572,7 +572,7 @@ def test_get_manage_folder_viewing_permissions_for_users(
_test_page_title=False,
)
assert normalize_spaces(page.select_one("title").text) == (
"folder_two – Select or create a template – service one – Notify.gov"
"Select or create a template – service one – Notify.gov"
)
form_labels = page.select("legend.usa-legend")
assert (
@@ -635,7 +635,7 @@ def test_get_manage_folder_viewing_permissions_for_users_not_visible_when_no_man
_test_page_title=False,
)
assert normalize_spaces(page.select_one("title").text) == (
"folder_two – Select or create a template – service one – Notify.gov"
"Select or create a template – service one – Notify.gov"
)
form_labels = page.select("legend[class=form-label]")
assert len(form_labels) == 0
@@ -672,7 +672,7 @@ def test_get_manage_folder_viewing_permissions_for_users_not_visible_for_service
_test_page_title=False,
)
assert normalize_spaces(page.select_one("title").text) == (
"folder_two – Select or create a template – service one – Notify.gov"
"Select or create a template – service one – Notify.gov"
)
form_labels = page.select("legend[class=form-label]")
assert len(form_labels) == 0
@@ -1161,7 +1161,7 @@ def test_should_show_radios_and_buttons_for_move_destination_if_correct_permissi
FOLDER_TWO_ID,
]
assert [x.text.strip() for x in radio_div.select("label")] == [
"Select or create a template",
"Templates",
"folder_one",
"folder_one_one",
"folder_one_two",

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

@@ -581,9 +581,9 @@ def test_should_be_able_to_view_a_template_with_links(
_test_page_title=False,
)
assert normalize_spaces(page.select_one("h1").text) == ("Review your message")
assert normalize_spaces(page.select_one("h1").text) == ("Confirm your template")
assert normalize_spaces(page.select_one("title").text) == (
"Two week reminder – Select or create a template – service one – Notify.gov"
"Confirm your template – service one – Notify.gov"
)
assert [