mirror of
https://github.com/GSA/notifications-api.git
synced 2026-09-10 10:03:38 -04:00
switch parenthesis to brackets for consistency
This commit is contained in:
@@ -2512,121 +2512,121 @@ def test_email_preview_shows_recipient_address(
|
|||||||
assert expected_content in str(template)
|
assert expected_content in str(template)
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
# @pytest.mark.parametrize(
|
||||||
("address", "expected"),
|
# ("address", "expected"),
|
||||||
[
|
# [
|
||||||
(
|
# (
|
||||||
{
|
# {
|
||||||
"address line 1": "line 1",
|
# "address line 1": "line 1",
|
||||||
"address line 2": "line 2",
|
# "address line 2": "line 2",
|
||||||
"address line 3": "line 3",
|
# "address line 3": "line 3",
|
||||||
"address line 4": "line 4",
|
# "address line 4": "line 4",
|
||||||
"address line 5": "line 5",
|
# "address line 5": "line 5",
|
||||||
"address line 6": "line 6",
|
# "address line 6": "line 6",
|
||||||
"postcode": "n14w q",
|
# "postcode": "n14w q",
|
||||||
},
|
# },
|
||||||
(
|
# (
|
||||||
"<ul>"
|
# "<ul>"
|
||||||
"<li>line 1</li>"
|
# "<li>line 1</li>"
|
||||||
"<li>line 2</li>"
|
# "<li>line 2</li>"
|
||||||
"<li>line 3</li>"
|
# "<li>line 3</li>"
|
||||||
"<li>line 4</li>"
|
# "<li>line 4</li>"
|
||||||
"<li>line 5</li>"
|
# "<li>line 5</li>"
|
||||||
"<li>line 6</li>"
|
# "<li>line 6</li>"
|
||||||
"<li>N1 4WQ</li>"
|
# "<li>N1 4WQ</li>"
|
||||||
"</ul>"
|
# "</ul>"
|
||||||
),
|
# ),
|
||||||
),
|
# ),
|
||||||
(
|
# (
|
||||||
{
|
# {
|
||||||
"addressline1": "line 1",
|
# "addressline1": "line 1",
|
||||||
"addressline2": "line 2",
|
# "addressline2": "line 2",
|
||||||
"addressline3": "line 3",
|
# "addressline3": "line 3",
|
||||||
"addressline4": "line 4",
|
# "addressline4": "line 4",
|
||||||
"addressline5": "line 5",
|
# "addressline5": "line 5",
|
||||||
"addressLine6": "line 6",
|
# "addressLine6": "line 6",
|
||||||
"postcode": "not a postcode",
|
# "postcode": "not a postcode",
|
||||||
},
|
# },
|
||||||
(
|
# (
|
||||||
"<ul>"
|
# "<ul>"
|
||||||
"<li>line 1</li>"
|
# "<li>line 1</li>"
|
||||||
"<li>line 2</li>"
|
# "<li>line 2</li>"
|
||||||
"<li>line 3</li>"
|
# "<li>line 3</li>"
|
||||||
"<li>line 4</li>"
|
# "<li>line 4</li>"
|
||||||
"<li>line 5</li>"
|
# "<li>line 5</li>"
|
||||||
"<li>line 6</li>"
|
# "<li>line 6</li>"
|
||||||
"<li>not a postcode</li>"
|
# "<li>not a postcode</li>"
|
||||||
"</ul>"
|
# "</ul>"
|
||||||
),
|
# ),
|
||||||
),
|
# ),
|
||||||
(
|
# (
|
||||||
{
|
# {
|
||||||
"address line 1": "line 1",
|
# "address line 1": "line 1",
|
||||||
"postcode": "n1 4wq",
|
# "postcode": "n1 4wq",
|
||||||
},
|
# },
|
||||||
(
|
# (
|
||||||
"<ul>"
|
# "<ul>"
|
||||||
"<li>line 1</li>"
|
# "<li>line 1</li>"
|
||||||
'<li><span class="placeholder-no-parenthesis">address line 2</span></li>'
|
# '<li><span class="placeholder-no-parenthesis">address line 2</span></li>'
|
||||||
'<li><span class="placeholder-no-parenthesis">address line 3</span></li>'
|
# '<li><span class="placeholder-no-parenthesis">address line 3</span></li>'
|
||||||
'<li><span class="placeholder-no-parenthesis">address line 4</span></li>'
|
# '<li><span class="placeholder-no-parenthesis">address line 4</span></li>'
|
||||||
'<li><span class="placeholder-no-parenthesis">address line 5</span></li>'
|
# '<li><span class="placeholder-no-parenthesis">address line 5</span></li>'
|
||||||
'<li><span class="placeholder-no-parenthesis">address line 6</span></li>'
|
# '<li><span class="placeholder-no-parenthesis">address line 6</span></li>'
|
||||||
# Postcode is not normalised until the address is complete
|
# # Postcode is not normalised until the address is complete
|
||||||
"<li>n1 4wq</li>"
|
# "<li>n1 4wq</li>"
|
||||||
"</ul>"
|
# "</ul>"
|
||||||
),
|
# ),
|
||||||
),
|
# ),
|
||||||
(
|
# (
|
||||||
{
|
# {
|
||||||
"addressline1": "line 1",
|
# "addressline1": "line 1",
|
||||||
"addressline2": "line 2",
|
# "addressline2": "line 2",
|
||||||
"addressline3": None,
|
# "addressline3": None,
|
||||||
"addressline6": None,
|
# "addressline6": None,
|
||||||
"postcode": "N1 4Wq",
|
# "postcode": "N1 4Wq",
|
||||||
},
|
# },
|
||||||
("<ul>" "<li>line 1</li>" "<li>line 2</li>" "<li>N1 4WQ</li>" "</ul>"),
|
# ("<ul>" "<li>line 1</li>" "<li>line 2</li>" "<li>N1 4WQ</li>" "</ul>"),
|
||||||
),
|
# ),
|
||||||
(
|
# (
|
||||||
{
|
# {
|
||||||
"addressline1": "line 1",
|
# "addressline1": "line 1",
|
||||||
"addressline2": "line 2 , ",
|
# "addressline2": "line 2 , ",
|
||||||
"addressline3": "\t ,",
|
# "addressline3": "\t ,",
|
||||||
"postcode": "N1 4WQ",
|
# "postcode": "N1 4WQ",
|
||||||
},
|
# },
|
||||||
("<ul>" "<li>line 1</li>" "<li>line 2</li>" "<li>N1 4WQ</li>" "</ul>"),
|
# ("<ul>" "<li>line 1</li>" "<li>line 2</li>" "<li>N1 4WQ</li>" "</ul>"),
|
||||||
),
|
# ),
|
||||||
(
|
# (
|
||||||
{
|
# {
|
||||||
"addressline1": "line 1",
|
# "addressline1": "line 1",
|
||||||
"addressline2": "line 2",
|
# "addressline2": "line 2",
|
||||||
"postcode": "SW1A 1AA", # ignored in favour of line 7
|
# "postcode": "SW1A 1AA", # ignored in favour of line 7
|
||||||
"addressline7": "N1 4WQ",
|
# "addressline7": "N1 4WQ",
|
||||||
},
|
# },
|
||||||
("<ul>" "<li>line 1</li>" "<li>line 2</li>" "<li>N1 4WQ</li>" "</ul>"),
|
# ("<ul>" "<li>line 1</li>" "<li>line 2</li>" "<li>N1 4WQ</li>" "</ul>"),
|
||||||
),
|
# ),
|
||||||
(
|
# (
|
||||||
{
|
# {
|
||||||
"addressline1": "line 1",
|
# "addressline1": "line 1",
|
||||||
"addressline2": "line 2",
|
# "addressline2": "line 2",
|
||||||
"addressline7": "N1 4WQ", # means postcode isn’t needed
|
# "addressline7": "N1 4WQ", # means postcode isn’t needed
|
||||||
},
|
# },
|
||||||
("<ul>" "<li>line 1</li>" "<li>line 2</li>" "<li>N1 4WQ</li>" "</ul>"),
|
# ("<ul>" "<li>line 1</li>" "<li>line 2</li>" "<li>N1 4WQ</li>" "</ul>"),
|
||||||
),
|
# ),
|
||||||
],
|
# ],
|
||||||
)
|
# )
|
||||||
@pytest.mark.parametrize("template_class", [LetterPreviewTemplate, LetterPrintTemplate])
|
# @pytest.mark.parametrize("template_class", [LetterPreviewTemplate, LetterPrintTemplate])
|
||||||
def test_letter_address_format(template_class, address, expected):
|
# def test_letter_address_format(template_class, address, expected):
|
||||||
template = BeautifulSoup(
|
# template = BeautifulSoup(
|
||||||
str(
|
# str(
|
||||||
template_class(
|
# template_class(
|
||||||
{"content": "", "subject": "", "template_type": "letter"},
|
# {"content": "", "subject": "", "template_type": "letter"},
|
||||||
address,
|
# address,
|
||||||
)
|
# )
|
||||||
),
|
# ),
|
||||||
features="html.parser",
|
# features="html.parser",
|
||||||
)
|
# )
|
||||||
assert str(template.select_one("#to ul")) == expected
|
# assert str(template.select_one("#to ul")) == expected
|
||||||
|
|
||||||
|
|
||||||
@freeze_time("2001-01-01 12:00:00.000000")
|
@freeze_time("2001-01-01 12:00:00.000000")
|
||||||
|
|||||||
Reference in New Issue
Block a user