From 994a314f310505bcf84faa0158d96523828ea428 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Mon, 2 Dec 2024 12:09:43 -0500 Subject: [PATCH] Trying to decouple this h1 from the templates folder structure --- app/models/service.py | 2 +- app/templates/views/templates/choose.html | 2 +- tests/app/main/views/test_template_folders.py | 40 +++++++++---------- tests/app/main/views/test_templates.py | 16 ++++---- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/app/models/service.py b/app/models/service.py index 53c1c83d8..e9bcf8a7d 100644 --- a/app/models/service.py +++ b/app/models/service.py @@ -456,7 +456,7 @@ class Service(JSONModel, SortByNameMixin): if folder_id is None: return { "id": None, - "name": "Select or create a template", + "name": "Templates", "parent_id": None, } return self._get_by_id(self.all_template_folders, folder_id) diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html index 24b3dd2da..d8fb191ec 100644 --- a/app/templates/views/templates/choose.html +++ b/app/templates/views/templates/choose.html @@ -8,7 +8,7 @@ {% extends "withnav_template.html" %} -{% set page_title = 'Templates' %} +{% set page_title = 'Select or create a template' %} {% block service_page_title %} {{ page_title_folder_path(template_folder_path) }} diff --git a/tests/app/main/views/test_template_folders.py b/tests/app/main/views/test_template_folders.py index a261f252e..f439cae18 100644 --- a/tests/app/main/views/test_template_folders.py +++ b/tests/app/main/views/test_template_folders.py @@ -53,7 +53,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): ), [ ( - "Templates – service one – Notify.gov", + "Select or create a template – service one – Notify.gov", "Templates", [], {}, @@ -92,7 +92,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): None, ), ( - "Templates – service one – Notify.gov", + "Select or create a template – service one – Notify.gov", "Templates", [], {"template_type": "all"}, @@ -131,7 +131,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): None, ), ( - "Templates – service one – Notify.gov", + "Select or create a template – service one – Notify.gov", "Templates", [], {"template_type": "sms"}, @@ -159,7 +159,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): None, ), ( - "folder_one – Templates – service one – Notify.gov", + "folder_one – Select or create a template – service one – Notify.gov", "Templates folder_one", [{"template_type": "all"}], {"template_folder_id": PARENT_FOLDER_ID}, @@ -182,7 +182,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): None, ), ( - "folder_one – Templates – service one – Notify.gov", + "folder_one – Select or create a template – service one – Notify.gov", "Templates folder_one", [{"template_type": "sms"}], {"template_type": "sms", "template_folder_id": PARENT_FOLDER_ID}, @@ -199,7 +199,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): None, ), ( - "folder_one – Templates – service one – Notify.gov", + "folder_one – Select or create a template – service one – Notify.gov", "Templates folder_one", [{"template_type": "email"}], {"template_type": "email", "template_folder_id": PARENT_FOLDER_ID}, @@ -210,7 +210,7 @@ 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 – Templates – service one – Notify.gov", + "folder_one_one – folder_one – Select or create a template – service one – Notify.gov", "Templates folder_one folder_one_one", [ {"template_type": "all"}, @@ -229,7 +229,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): None, ), ( - "folder_one_one_one – folder_one_one – folder_one – Templates – service one – Notify.gov", + "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", [ {"template_type": "all"}, @@ -250,7 +250,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): None, ), ( - "folder_one_one_one – folder_one_one – folder_one – Templates – service one – Notify.gov", + "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", [ {"template_type": "email"}, @@ -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 – Templates – service one – Notify.gov", - "Templates folder_two", + "folder_two – Select or create a template – service one – Notify.gov", + "Select or create a template folder_two", [{"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 – Templates – service one – Notify.gov", - "Templates folder_two", + "folder_two – Select or create a template – service one – Notify.gov", + "Select or create a template folder_two", [{"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 – Templates – service one – Notify.gov", - "Templates folder_two", + "folder_two – Select or create a template – service one – Notify.gov", + "Select or create a template folder_two", [{"template_type": "all"}], {"template_folder_id": FOLDER_TWO_ID, "template_type": "all"}, ["Email", "Text message"], @@ -529,7 +529,7 @@ def test_get_manage_folder_page( _test_page_title=False, ) assert normalize_spaces(page.select_one("title").text) == ( - "folder_two – Templates – service one – Notify.gov" + "folder_two – 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") @@ -571,7 +571,7 @@ def test_get_manage_folder_viewing_permissions_for_users( _test_page_title=False, ) assert normalize_spaces(page.select_one("title").text) == ( - "folder_two – Templates – service one – Notify.gov" + "folder_two – Select or create a template – service one – Notify.gov" ) form_labels = page.select("legend.usa-legend") assert ( @@ -634,7 +634,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 – Templates – service one – Notify.gov" + "folder_two – Select or create a template – service one – Notify.gov" ) form_labels = page.select("legend[class=form-label]") assert len(form_labels) == 0 @@ -671,7 +671,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 – Templates – service one – Notify.gov" + "folder_two – Select or create a template – service one – Notify.gov" ) form_labels = page.select("legend[class=form-label]") assert len(form_labels) == 0 @@ -1160,7 +1160,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")] == [ - "Templates", + "Select or create a template", "folder_one", "folder_one_one", "folder_one_two", diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py index 6e2ff227d..7676d0f17 100644 --- a/tests/app/main/views/test_templates.py +++ b/tests/app/main/views/test_templates.py @@ -69,7 +69,7 @@ def test_should_show_empty_page_when_no_templates( service_id=service_one["id"], ) - assert normalize_spaces(page.select_one("h1").text) == ("Templates") + assert normalize_spaces(page.select_one("h1").text) == ("Select or create a template") assert normalize_spaces(page.select_one("main p").text) == (expected_message) assert page.select_one("#add_new_folder_form") assert page.select_one("#add_new_template_form") @@ -87,7 +87,7 @@ def test_should_show_add_template_form_if_service_has_folder_permission( service_id=service_one["id"], ) - assert normalize_spaces(page.select_one("h1").text) == ("Templates") + assert normalize_spaces(page.select_one("h1").text) == ("Select or create a template") assert normalize_spaces(page.select_one("main p").text) == ( "Every message starts with a template. You can change it later. " "You need a template before you can send messages." @@ -110,7 +110,7 @@ def test_should_show_add_template_form_if_service_has_folder_permission( [ ( create_active_user_view_permissions(), - "Templates", + "Select or create a template", {}, ["Email", "Text message"], [ @@ -122,21 +122,21 @@ def test_should_show_add_template_form_if_service_has_folder_permission( ), ( create_active_user_view_permissions(), - "Templates", + "Select or create a template", {"template_type": "sms"}, ["All", "Email"], ["sms_template_one", "sms_template_two"], ), ( create_active_user_view_permissions(), - "Templates", + "Select or create a template", {"template_type": "email"}, ["All", "Text message"], ["email_template_one", "email_template_two"], ), ( create_active_caseworking_user(), - "Templates", + "Select or create a template", {}, ["Email", "Text message"], [ @@ -148,7 +148,7 @@ def test_should_show_add_template_form_if_service_has_folder_permission( ), ( create_active_caseworking_user(), - "Templates", + "Select or create a template", {"template_type": "email"}, ["All", "Text message"], ["email_template_one", "email_template_two"], @@ -583,7 +583,7 @@ def test_should_be_able_to_view_a_template_with_links( assert normalize_spaces(page.select_one("h1").text) == ("Review your message") assert normalize_spaces(page.select_one("title").text) == ( - "Two week reminder – Templates – service one – Notify.gov" + "Two week reminder – Select or create a template – service one – Notify.gov" ) assert [