From 9ef89666b0f92aff199be62f4fed58aa614de2a7 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 3 Dec 2024 17:00:18 -0800 Subject: [PATCH] fixed testing --- app/templates/components/folder-path.html | 8 +-- app/templates/views/templates/choose.html | 8 +-- .../templates/manage-template-folder.html | 6 +-- app/templates/views/templates/template.html | 10 ++-- tests/app/main/views/test_template_folders.py | 51 ++++++++++--------- 5 files changed, 43 insertions(+), 40 deletions(-) diff --git a/app/templates/components/folder-path.html b/app/templates/components/folder-path.html index 7ead0c568..05a577a89 100644 --- a/app/templates/components/folder-path.html +++ b/app/templates/components/folder-path.html @@ -3,10 +3,10 @@ service_id, template_type, current_user, - link_current_item=False + link_current_item=False, + root_element='nav' ) %} - - + {% endmacro %} diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html index 5813a361f..9c58c59cf 100644 --- a/app/templates/views/templates/choose.html +++ b/app/templates/views/templates/choose.html @@ -37,13 +37,15 @@

Every message starts with a template. To send, choose or create a template.

- {# you don't need this unless you're trying to add the parent breadcrumb title to the first page of the flow #} - + ) }} {% if current_user.has_permissions('manage_templates') and current_template_folder_id and user_has_template_folder_permission %}
diff --git a/app/templates/views/templates/manage-template-folder.html b/app/templates/views/templates/manage-template-folder.html index 528631f2e..42a3cbf7c 100644 --- a/app/templates/views/templates/manage-template-folder.html +++ b/app/templates/views/templates/manage-template-folder.html @@ -3,9 +3,9 @@ {% from "components/page-footer.html" import page_footer %} {% from "components/form.html" import form_wrapper %} -{% block service_page_title %} - {{ page_title_folder_path(template_folder_path) }} -{% endblock %} +{% set page_title = 'Select or create a template' %} + +{% block service_page_title %}{{page_title}}{% endblock %} {% block maincolumn_content %} diff --git a/app/templates/views/templates/template.html b/app/templates/views/templates/template.html index d9f163621..708902221 100644 --- a/app/templates/views/templates/template.html +++ b/app/templates/views/templates/template.html @@ -1,13 +1,13 @@ {% extends "withnav_template.html" %} {% from "components/banner.html" import banner_wrapper %} -{% from "components/folder-path.html" import folder_path, page_title_folder_path %} +{% from "components/folder-path.html" import folder_path %} {% from "components/page-footer.html" import page_footer %} {% from "components/copy-to-clipboard.html" import copy_to_clipboard %} {% from "components/components/button/macro.njk" import usaButton %} -{% block service_page_title %} - {{ page_title_folder_path(current_service.get_template_path(template._template)) }} -{% endblock %} +{% set page_title = 'Confirm your template' %} + +{% block service_page_title %}{{page_title}}{% endblock %} {% block maincolumn_content %} @@ -33,7 +33,7 @@

- Confirm your template + {{page_title}}

{{ folder_path( folders=current_service.get_template_path(template._template), diff --git a/tests/app/main/views/test_template_folders.py b/tests/app/main/views/test_template_folders.py index 574bf62e6..8c5f632ee 100644 --- a/tests/app/main/views/test_template_folders.py +++ b/tests/app/main/views/test_template_folders.py @@ -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"], @@ -350,9 +350,10 @@ def test_should_show_templates_folder_page( 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 +531,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 +573,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 +636,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 +673,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 +1162,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",