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

fixed title testing

Browse Source
This commit is contained in:
Beverly Nguyen
2024-12-03 13:05:55 -08:00
parent 66c377c39d
commit 4946bed5cc
4 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/templates/base.html
View File

@@ -6,9 +6,7 @@
<html lang="{{ htmlLang | default('en') }}" class="{{ htmlClasses }}"> <html lang="{{ htmlLang | default('en') }}" class="{{ htmlClasses }}">
<head> <head>
<title> <title>
{% block pageTitle %} {% block pageTitle %}{% block per_page_title %}{% endblock %} – Notify.gov{% endblock %}
{% block per_page_title %}{% endblock %} – Notify.gov
{% endblock %}
</title> </title>
{% include "components/head.html" %} {% include "components/head.html" %}
</head> </head>

4
app/templates/views/templates/choose.html
View File

@@ -10,9 +10,7 @@
{% set page_title = 'Select or create a template' %} {% set page_title = 'Select or create a template' %}
{% block service_page_title %} {% block service_page_title %}{{page_title}}{% endblock %}
{{page_title}}
{% endblock %}
{% block maincolumn_content %} {% block maincolumn_content %}

9
app/templates/withnav_template.html
View File

@@ -1,12 +1,7 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block per_page_title %} {% block per_page_title %}{% if current_org.name %}{% block org_page_title %}{% endblock %} – {{ current_org.name }}{%
{% if current_org.name %} else %}{% block service_page_title %}{% endblock %} – {{ current_service.name }}{% endif %}{% endblock %}
{% block org_page_title %}{% endblock %} – {{ current_org.name }}
{% else %}
{% block service_page_title %}{% endblock %} – {{ current_service.name }}
{% endif %}
{% endblock %}
{% block main %} {% block main %}
<div class="grid-container"> <div class="grid-container">

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

@@ -41,8 +41,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
@pytest.mark.parametrize( @pytest.mark.parametrize(
( (
"expected_title_tag",
"expected_page_title", "expected_page_title",
"expected_title_tag",
"expected_parent_link_args", "expected_parent_link_args",
"extra_args", "extra_args",
"expected_nav_links", "expected_nav_links",
@@ -54,7 +54,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
[ [
( (
"Select or create a template – service one – Notify.gov", "Select or create a template – service one – Notify.gov",
"Templates", "Select or create a template",
[], [],
{}, {},
["Email", "Text message"], ["Email", "Text message"],
@@ -93,7 +93,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
), ),
( (
"Select or create a template – service one – Notify.gov", "Select or create a template – service one – Notify.gov",
"Templates", "Select or create a template",
[], [],
{"template_type": "all"}, {"template_type": "all"},
["Email", "Text message"], ["Email", "Text message"],
@@ -132,7 +132,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
), ),
( (
"Select or create a template – service one – Notify.gov", "Select or create a template – service one – Notify.gov",
"Templates", "Select or create a template",
[], [],
{"template_type": "sms"}, {"template_type": "sms"},
["All", "Email"], ["All", "Email"],
@@ -346,8 +346,9 @@ def test_should_show_templates_folder_page(
**extra_args, **extra_args,
) )
assert normalize_spaces(page.select_one("title").text) == expected_title_tag
assert normalize_spaces(page.select_one("h2").text) == expected_page_title 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) assert len(page.select("h2 a")) == len(expected_parent_link_args)