Merge branch 'main' of https://github.com/GSA/notifications-admin into 2554-add-cancel-button-and-modal-to-preview-send-page

This commit is contained in:
Jonathan Bobel
2025-05-14 17:01:56 -04:00
11 changed files with 4207 additions and 35 deletions

View File

@@ -1451,7 +1451,7 @@ def test_send_one_off_offers_link_to_upload(
assert back_link.text.strip() in {
"Back to all templates",
"Back to confirm your template"
"Back to confirm your template",
}
assert link.text.strip() == "Upload a list of phone numbers"
@@ -2288,7 +2288,9 @@ def test_check_messages_back_link(
actual_href = page.find_all("a", {"class": "usa-back-link"})[0]["href"]
expected_href = expected_url(service_id=SERVICE_ONE_ID, template_id=fake_uuid)
assert actual_href != "#", "Back link href fell back to '#' — missing correct back_link in view"
assert (
actual_href != "#"
), "Back link href fell back to '#' — missing correct back_link in view"
assert actual_href == expected_href

View File

@@ -25,7 +25,7 @@ def test_sets_metadata(client_request, mocker):
def test_removes_blank_lines():
filedata = {
"data": "phone number\r\n15555555555\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n"
"data": "variable,phone number\r\ntest,+15555555555\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n"
}
file_data = remove_blank_lines(filedata)
assert file_data == {"data": "phone number\n15555555555"}
assert file_data == {"data": "variable,phone number\r\ntest,+15555555555"}