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

notify-api-861 show eastern time

Browse Source
This commit is contained in:
Kenneth Kehl
2023-11-16 12:24:27 -08:00
parent 0b4981b25c
commit 36987e7202
19 changed files with 237 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/app/main/views/test_activity.py
View File

@@ -159,7 +159,10 @@ def test_can_show_notifications(
assert normalize_spaces(
first_row.select_one(".table-field-right-aligned .align-with-message-body").text
) == ("Delivered 1 January at 06:01 UTC")
) in [
"Delivered 1 January at 02:01 US/Eastern",
"Delivered 1 January at 01:01 US/Eastern",
]
assert page_title in page.h1.text.strip()
@@ -653,31 +656,36 @@ def test_redacts_templates_that_should_be_redacted(
@pytest.mark.parametrize(
("message_type", "status", "expected_hint_status", "single_line"),
[
("email", "created", "Sending since 27 September at 12:30 UTC", True),
("email", "sending", "Sending since 27 September at 12:30 UTC", True),
("email", "created", "Sending since 27 September at 08:30 US/Eastern", True),
("email", "sending", "Sending since 27 September at 08:30 US/Eastern", True),
(
"email",
"temporary-failure",
"Inbox not accepting messages right now 27 September at 12:31 UTC",
"Inbox not accepting messages right now 27 September at 08:31 US/Eastern",
False,
),
(
"email",
"permanent-failure",
"Email address does not exist 27 September at 12:31 UTC",
"Email address does not exist 27 September at 08:31 US/Eastern",
False,
),
("email", "delivered", "Delivered 27 September at 12:31 UTC", True),
("sms", "created", "Sending since 27 September at 12:30 UTC", True),
("sms", "sending", "Sending since 27 September at 12:30 UTC", True),
("email", "delivered", "Delivered 27 September at 08:31 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 12:31 UTC",
"Phone not accepting messages right now 27 September at 08:31 US/Eastern",
False,
),
("sms", "permanent-failure", "Not delivered 27 September at 12:31 UTC", False),
("sms", "delivered", "Delivered 27 September at 12:31 UTC", True),
(
"sms",
"permanent-failure",
"Not delivered 27 September at 08:31 US/Eastern",
False,
),
("sms", "delivered", "Delivered 27 September at 08:31 US/Eastern", True),
],
)
def test_sending_status_hint_displays_correctly_on_notifications_page(

28
tests/app/main/views/test_conversation.py
View File

@@ -70,7 +70,7 @@ def test_get_user_phone_number_raises_if_both_api_requests_fail(mocker):
(False, "Hello Jo"),
],
)
@freeze_time("2012-01-01 00:00:00")
@freeze_time("2012-01-01 05:00:00")
def test_view_conversation(
client_request,
mocker,
@@ -113,55 +113,55 @@ def test_view_conversation(
[
(
"message-8",
"yesterday at 14:59 UTC",
"yesterday at 14:59 US/Eastern",
),
(
"message-7",
"yesterday at 14:59 UTC",
"yesterday at 14:59 US/Eastern",
),
(
"message-6",
"yesterday at 16:59 UTC",
"yesterday at 16:59 US/Eastern",
),
(
"message-5",
"yesterday at 18:59 UTC",
"yesterday at 18:59 US/Eastern",
),
(
"message-4",
"yesterday at 20:59 UTC",
"yesterday at 20:59 US/Eastern",
),
(
"message-3",
"yesterday at 22:59 UTC",
"yesterday at 22:59 US/Eastern",
),
(
"message-2",
"yesterday at 22:59 UTC",
"yesterday at 22:59 US/Eastern",
),
(
"message-1",
"yesterday at 23:00 UTC",
"yesterday at 23:00 US/Eastern",
),
(
expected_outbound_content,
"yesterday at 00:00 UTC",
"yesterday at 00:00 US/Eastern",
),
(
expected_outbound_content,
"yesterday at 00:00 UTC",
"yesterday at 00:00 US/Eastern",
),
(
expected_outbound_content,
"yesterday at 00:00 UTC",
"yesterday at 00:00 US/Eastern",
),
(
expected_outbound_content,
"yesterday at 00:00 UTC",
"yesterday at 00:00 US/Eastern",
),
(
expected_outbound_content,
"yesterday at 00:00 UTC",
"yesterday at 00:00 US/Eastern",
),
]
):

22
tests/app/main/views/test_dashboard.py
View File

@@ -379,7 +379,7 @@ def test_view_inbox_updates(
mock_get_partials.assert_called_once_with(SERVICE_ONE_ID)
@freeze_time("2016-07-01 12:00")
@freeze_time("2016-07-01 16:00")
def test_download_inbox(
client_request,
mock_get_inbound_sms,
@@ -394,14 +394,14 @@ def test_download_inbox(
)
assert response.get_data(as_text=True) == (
"Phone number,Message,Received\r\n"
"(202) 867-5300,message-1,2016-07-01 11:00 UTC\r\n"
"(202) 867-5300,message-2,2016-07-01 10:59 UTC\r\n"
"(202) 867-5300,message-3,2016-07-01 10:59 UTC\r\n"
"(202) 867-5302,message-4,2016-07-01 08:59 UTC\r\n"
"+33 1 12 34 56 78,message-5,2016-07-01 06:59 UTC\r\n"
"(202) 555-0104,message-6,2016-07-01 04:59 UTC\r\n"
"(202) 555-0104,message-7,2016-07-01 02:59 UTC\r\n"
"+682 12345,message-8,2016-07-01 02:59 UTC\r\n"
"(202) 867-5300,message-1,2016-07-01 11:00 US/Eastern\r\n"
"(202) 867-5300,message-2,2016-07-01 10:59 US/Eastern\r\n"
"(202) 867-5300,message-3,2016-07-01 10:59 US/Eastern\r\n"
"(202) 867-5302,message-4,2016-07-01 08:59 US/Eastern\r\n"
"+33 1 12 34 56 78,message-5,2016-07-01 06:59 US/Eastern\r\n"
"(202) 555-0104,message-6,2016-07-01 04:59 US/Eastern\r\n"
"(202) 555-0104,message-7,2016-07-01 02:59 US/Eastern\r\n"
"+682 12345,message-8,2016-07-01 02:59 US/Eastern\r\n"
)
@@ -636,7 +636,7 @@ def test_monthly_has_equal_length_tables(
assert page.select_one(".table-field-headings th").get("width") == "33%"
@freeze_time("2016-01-01 1:09:00.061258")
@freeze_time("2016-01-01 11:09:00.061258")
def test_should_show_upcoming_jobs_on_dashboard(
client_request,
mock_get_service_templates,
@@ -659,7 +659,7 @@ def test_should_show_upcoming_jobs_on_dashboard(
assert normalize_spaces(page.select_one("main h2").text) == ("In the next few days")
assert normalize_spaces(page.select_one("a.banner-dashboard").text) == (
"2 files waiting to send " "- sending starts today at 11:09 UTC"
"2 files waiting to send " "- sending starts today at 06:09 US/Eastern"
)
assert page.select_one("a.banner-dashboard")["href"] == url_for(

40
tests/app/main/views/test_history.py
View File

@@ -11,30 +11,30 @@ from tests.conftest import SERVICE_ONE_ID, normalize_spaces
{},
[
(
"12 December",
"12 December 2012",
(
"Test User 18:13 "
"Test User 13:13 "
"Renamed this service from ‘Before lunch’ to ‘After lunch’ "
"Test User 17:12 "
"Test User 12:12 "
"Renamed this service from ‘Example service’ to ‘Before lunch’"
),
),
(
"11 November",
("Test User 17:12 " "Revoked the ‘Bad key’ API key"),
"11 November 2012",
("Test User 12:12 " "Revoked the ‘Bad key’ API key"),
),
(
"11 November 2011",
("Test User 16:11 " "Created an API key called ‘Bad key’"),
"11 November",
("Test User 11:11 " "Created an API key called ‘Bad key’"),
),
(
"10 October 2010",
(
"Test User 15:10 "
"Test User 11:10 "
"Created an API key called ‘Good key’ "
"Test User 14:09 "
"Test User 10:09 "
"Created an API key called ‘Key event returned in non-chronological order’ "
"Test User 06:01 "
"Test User 02:01 "
"Created this service and called it ‘Example service’"
),
),
@@ -44,19 +44,19 @@ from tests.conftest import SERVICE_ONE_ID, normalize_spaces
{"selected": "api"},
[
(
"11 November",
("Test User 17:12 " "Revoked the ‘Bad key’ API key"),
"11 November 2012",
("Test User 12:12 " "Revoked the ‘Bad key’ API key"),
),
(
"11 November 2011",
("Test User 16:11 " "Created an API key called ‘Bad key’"),
"11 November",
("Test User 11:11 " "Created an API key called ‘Bad key’"),
),
(
"10 October 2010",
(
"Test User 15:10 "
"Test User 11:10 "
"Created an API key called ‘Good key’ "
"Test User 14:09 "
"Test User 10:09 "
"Created an API key called ‘Key event returned in non-chronological order’"
),
),
@@ -66,18 +66,18 @@ from tests.conftest import SERVICE_ONE_ID, normalize_spaces
{"selected": "service"},
[
(
"12 December",
"12 December 2012",
(
"Test User 18:13 "
"Test User 13:13 "
"Renamed this service from ‘Before lunch’ to ‘After lunch’ "
"Test User 17:12 "
"Test User 12:12 "
"Renamed this service from ‘Example service’ to ‘Before lunch’"
),
),
(
"10 October 2010",
(
"Test User 06:01 "
"Test User 02:01 "
"Created this service and called it ‘Example service’"
),
),

16
tests/app/main/views/test_jobs.py
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 11:10 UTC"
"2021234567 template content Delivered 1 January at 06:10 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 11:10 UTC"
"2021234567 " "template content " "Delivered 1 January at 06:10 US/Eastern"
)
assert page.select_one("tbody tr a")["href"] == url_for(
"main.view_notification",
@@ -334,7 +334,7 @@ def test_should_show_old_job(
]
@freeze_time("2016-01-01T05:00:00.061258")
@freeze_time("2016-01-01T06:00:00.061258")
def test_should_show_scheduled_job(
client_request,
mock_get_service_template,
@@ -350,7 +350,7 @@ def test_should_show_scheduled_job(
)
assert normalize_spaces(page.select("main p")[1].text) == (
"Sending Two week reminder tomorrow at 05:00 UTC"
"Sending Two week reminder today at 00:00 US/Eastern"
)
assert page.select("main p a")[0]["href"] == url_for(
"main.view_template_version",
@@ -423,8 +423,8 @@ 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 "05:01" in content["notifications"]
assert "Sent by Test User on 1 January at 05:00" in content["status"]
assert "00:01" in content["notifications"]
assert "Sent by Test User on 1 January at 00:00" in content["status"]
@freeze_time("2016-01-01 05:00:00.000001")
@@ -465,8 +465,8 @@ 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 "05:01" in content["notifications"]
assert "Sent by Test User on 1 June at 20:00" in content["status"]
assert "00:01" in content["notifications"]
assert "Sent by Test User on 1 June at 16:00" in content["status"]
@pytest.mark.parametrize(

12
tests/app/main/views/test_notifications.py
View File

@@ -226,19 +226,23 @@ def test_notification_status_shows_expected_back_link(
[
(
"2012-01-01 06:01",
("‘sample template’ was sent by Test User today at 06:01 UTC"),
("‘sample template’ was sent by Test User today at 01:01 US/Eastern"),
),
(
"2012-01-02 06:01",
("‘sample template’ was sent by Test User yesterday at 06:01 UTC"),
("‘sample template’ was sent by Test User yesterday at 01:01 US/Eastern"),
),
(
"2012-01-03 06:01",
("‘sample template’ was sent by Test User on 1 January at 06:01 UTC"),
(
"‘sample template’ was sent by Test User on 1 January at 01:01 US/Eastern"
),
),
(
"2013-01-03 06:01",
("‘sample template’ was sent by Test User on 1 January 2012 at 06:01 UTC"),
(
"‘sample template’ was sent by Test User on 1 January 2012 at 01:01 US/Eastern"
),
),
],
)

2
tests/app/main/views/test_providers.py
View File

@@ -200,7 +200,7 @@ def test_view_providers_shows_all_providers(
assert table_data[1].text.strip() == "20"
assert table_data[2].text.strip() == "42"
assert table_data[3].text.strip() == "True"
assert table_data[4].text.strip() == "16 January at 15:20 UTC"
assert table_data[4].text.strip() == "16 January at 10:20 US/Eastern"
assert table_data[5].text.strip() == "Test User"
domestic_sms_second_row = domestic_sms_table.tbody.find_all("tr")[1]

8
tests/app/main/views/test_templates.py
View File

@@ -472,7 +472,7 @@ def test_caseworker_redirected_to_set_sender_for_one_off(
)
@freeze_time("2020-01-01 15:00")
@freeze_time("2020-01-01 20:00")
def test_caseworker_sees_template_page_if_template_is_deleted(
client_request,
mock_get_deleted_template,
@@ -497,7 +497,7 @@ def test_caseworker_sees_template_page_if_template_is_deleted(
)
assert (
page.select("p.hint")[0].text.strip()
== "This template was deleted today at 15:00 UTC."
== "This template was deleted today at 15:00 US/Eastern."
)
mock_get_deleted_template.assert_called_with(SERVICE_ONE_ID, template_id, None)
@@ -1573,7 +1573,7 @@ def test_should_redirect_when_deleting_a_template(
mock_delete_service_template.assert_called_with(SERVICE_ONE_ID, TEMPLATE_ONE_ID)
@freeze_time("2016-01-01T15:00")
@freeze_time("2016-01-01T20:00")
def test_should_show_page_for_a_deleted_template(
client_request,
mock_get_template_folders,
@@ -1606,7 +1606,7 @@ def test_should_show_page_for_a_deleted_template(
)
assert (
page.select("p.hint")[0].text.strip()
== "This template was deleted today at 15:00 UTC."
== "This template was deleted today at 15:00 US/Eastern."
)
assert "Delete this template" not in page.select_one("main").text

8
tests/app/main/views/uploads/test_upload_hub.py
View File

@@ -51,7 +51,9 @@ def test_get_upload_hub_page(
assert len(uploads) == 1
assert normalize_spaces(uploads[0].text.strip()) == (
"some.csv " "Sent 1 January 2016 at 11:09 UTC " "0 pending 8 delivered 2 failed"
"some.csv "
"Sent 1 January 2016 at 06:09 US/Eastern "
"0 pending 8 delivered 2 failed"
)
assert uploads[0].select_one("a.file-list-filename-large")["href"] == (
"/services/{}/jobs/job_id_1".format(SERVICE_ONE_ID)
@@ -80,12 +82,12 @@ def test_uploads_page_shows_scheduled_jobs(
("File Status"),
(
"even_later.csv "
"Sending 1 January 2016 at 23:09 UTC "
"Sending 1 January 2016 at 18:09 US/Eastern "
"1 text message waiting to send"
),
(
"send_me_later.csv "
"Sending 1 January 2016 at 11:09 UTC "
"Sending 1 January 2016 at 06:09 US/Eastern "
"1 text message waiting to send"
),
]