Merge branch 'main' of https://github.com/GSA/notifications-admin into sms-allowance-dashboardbug

This commit is contained in:
Andrew Shumway
2024-02-07 09:38:43 -07:00
10 changed files with 379 additions and 81 deletions

View File

@@ -160,8 +160,8 @@ def test_can_show_notifications(
assert normalize_spaces(
first_row.select_one(".table-field-right-aligned .align-with-message-body").text
) in [
"Delivered 1 January at 02:01 US/Eastern",
"Delivered 1 January at 01:01 US/Eastern",
"Delivered 1 January at 02:00 US/Eastern",
"Delivered 1 January at 01:00 US/Eastern",
]
assert page_title in page.h1.text.strip()
@@ -661,31 +661,31 @@ def test_redacts_templates_that_should_be_redacted(
(
"email",
"temporary-failure",
"Inbox not accepting messages right now 27 September at 08:31 US/Eastern",
"Inbox not accepting messages right now 27 September at 08:30 US/Eastern",
False,
),
(
"email",
"permanent-failure",
"Email address does not exist 27 September at 08:31 US/Eastern",
"Email address does not exist 27 September at 08:30 US/Eastern",
False,
),
("email", "delivered", "Delivered 27 September at 08:31 US/Eastern", True),
("email", "delivered", "Delivered 27 September at 08:30 US/Eastern", True),
("sms", "created", "Sending since 27 September at 08:30 US/Eastern", True),
("sms", "sending", "Sending since 27 September at 08:30 US/Eastern", True),
(
"sms",
"temporary-failure",
"Phone not accepting messages right now 27 September at 08:31 US/Eastern",
"Phone not accepting messages right now 27 September at 08:30 US/Eastern",
False,
),
(
"sms",
"permanent-failure",
"Not delivered 27 September at 08:31 US/Eastern",
"Not delivered 27 September at 08:30 US/Eastern",
False,
),
("sms", "delivered", "Delivered 27 September at 08:31 US/Eastern", True),
("sms", "delivered", "Delivered 27 September at 08:30 US/Eastern", True),
],
)
def test_sending_status_hint_displays_correctly_on_notifications_page(

View File

@@ -90,7 +90,7 @@ def test_should_show_page_for_one_job(
assert page.h1.text.strip() == "thisisatest.csv"
assert " ".join(page.find("tbody").find("tr").text.split()) == (
"2021234567 template content Delivered 1 January at 06:10 US/Eastern"
"2021234567 template content Delivered 1 January at 06:09 US/Eastern"
)
assert page.find("div", {"data-key": "notifications"})["data-resource"] == url_for(
"main.view_job_updates",
@@ -109,7 +109,7 @@ def test_should_show_page_for_one_job(
assert page.find("span", {"id": "time-left"}).text == "Data available for 7 days"
assert normalize_spaces(page.select_one("tbody tr").text) == normalize_spaces(
"2021234567 " "template content " "Delivered 1 January at 06:10 US/Eastern"
"2021234567 " "template content " "Delivered 1 January at 06:09 US/Eastern"
)
assert page.select_one("tbody tr a")["href"] == url_for(
"main.view_notification",
@@ -424,7 +424,7 @@ def test_should_show_updates_for_one_job_as_json(
assert "2021234567" in content["notifications"]
assert "Status" in content["notifications"]
assert "Delivered" in content["notifications"]
assert "00:01" in content["notifications"]
assert "00:00" in content["notifications"]
assert "Sent by Test User on 1 January at 00:00" in content["status"]
@@ -466,7 +466,7 @@ def test_should_show_updates_for_scheduled_job_as_json(
assert "2021234567" in content["notifications"]
assert "Status" in content["notifications"]
assert "Delivered" in content["notifications"]
assert "00:01" in content["notifications"]
assert "00:00" in content["notifications"]
assert "Sent by Test User on 1 June at 16:00" in content["status"]