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

Merge branch 'main' of https://github.com/GSA/notifications-admin into 1252-missing-blue-boxes

Browse Source
This commit is contained in:
Jonathan Bobel
2024-03-27 09:57:34 -04:00
parent 6c1090ecb2 fd1ab3bf2e
commit c6af0957e9
17 changed files with 111 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/app/main/views/test_api_integration.py
View File

@@ -6,7 +6,7 @@ from unittest.mock import call
import pytest
from flask import url_for
from app.formatters import format_datetime_short
from app.formatters import format_datetime_table
from tests import sample_uuid, validate_route_permission
from tests.conftest import SERVICE_ONE_ID, normalize_spaces
@@ -123,7 +123,7 @@ def test_should_show_api_keys_page(
assert rows[0] == "API keys Action"
assert (
rows[1]
== f"another key name Revoked {format_datetime_short(date.fromtimestamp(0).isoformat())}"
== f"another key name Revoked {format_datetime_table(date.fromtimestamp(0).isoformat())}"
)
assert rows[2] == "some key name Revoke some key name"

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

@@ -511,18 +511,18 @@ def test_download_inbox(
)
assert response.headers["Content-Type"] == ("text/csv; " "charset=utf-8")
assert response.headers["Content-Disposition"] == (
"inline; " 'filename="Received text messages 2016-07-01.csv"'
"inline; " 'filename="Received text messages 07-01-2016.csv"'
)
assert response.get_data(as_text=True) == (
"Phone number,Message,Received\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"
"(202) 867-5300,message-1,07-01-2016 11:00 US/Eastern\r\n"
"(202) 867-5300,message-2,07-01-2016 10:59 US/Eastern\r\n"
"(202) 867-5300,message-3,07-01-2016 10:59 US/Eastern\r\n"
"(202) 867-5302,message-4,07-01-2016 08:59 US/Eastern\r\n"
"+33 1 12 34 56 78,message-5,07-01-2016 06:59 US/Eastern\r\n"
"(202) 555-0104,message-6,07-01-2016 04:59 US/Eastern\r\n"
"(202) 555-0104,message-7,07-01-2016 02:59 US/Eastern\r\n"
"+682 12345,message-8,07-01-2016 02:59 US/Eastern\r\n"
)

14
tests/app/main/views/test_jobs.py
View File

@@ -88,7 +88,7 @@ def test_should_show_page_for_one_job(
status=status_argument,
)
assert page.h1.text.strip() == "thisisatest.csv"
assert page.h1.text.strip() == "Message status"
assert " ".join(page.find("tbody").find("tr").text.split()) == (
"2021234567 template content Delivered 01-01-2016 at 06:09 AM"
)
@@ -237,11 +237,11 @@ def test_should_show_job_with_sending_limit_exceeded_status(
job_id=fake_uuid,
)
assert normalize_spaces(page.select("main p")[1].text) == (
assert normalize_spaces(page.select("main p")[2].text) == (
"Notify cannot send these messages because you have reached a limit. "
"You can only send 1,000 messages per day and 250,000 messages in total."
)
assert normalize_spaces(page.select("main p")[2].text) == (
assert normalize_spaces(page.select("main p")[3].text) == (
"Upload this spreadsheet again tomorrow or contact the Notify.gov team to raise the limit."
)
@@ -349,7 +349,7 @@ def test_should_show_scheduled_job(
)
assert normalize_spaces(page.select("main div p")[1].text) == (
"Sending Two week reminder today at 00:00 US/Eastern"
"Example template - service one was scheduled on January 02, 2016 at 12:00 AM US/Eastern by Test User"
)
assert page.select("main p a")[0]["href"] == url_for(
@@ -423,8 +423,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 "Sent by Test User on 01-01-2016 at 12:00 AM" in content["status"]
assert "12:00" in content["notifications"]
assert "01-01-2016 at 12:00 AM" in content["notifications"]
@freeze_time("2016-01-01 05:00:00.000001")
@@ -465,8 +464,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 "Sent by Test User on 06-01-2016 at 04:00 PM" in content["status"]
assert "12:00" in content["notifications"]
assert "01-01-2016 at 12:00 AM" in content["notifications"]
@pytest.mark.parametrize(

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

@@ -267,10 +267,6 @@ def test_notification_page_doesnt_link_to_template_in_tour(
notification_id=fake_uuid,
help=3,
)
assert normalize_spaces(page.select("main p:nth-of-type(1)")[0].text) == (
expected_message
)
assert len(page.select("main p:nth-of-type(1) a")) == 0

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

@@ -116,26 +116,26 @@ def test_should_render_performance_page(
""
"Messages sent since May 2023 "
"Date Emails Text messages "
"27 February 2021 1 2 "
"26 February 2021 1 2 "
"25 February 2021 1 2 "
"24 February 2021 1 2 "
"23 February 2021 1 2 "
"22 February 2021 1 2 "
"21 February 2021 1,234,567 123,456 "
"February 27, 2021 1 2 "
"February 26, 2021 1 2 "
"February 25, 2021 1 2 "
"February 24, 2021 1 2 "
"February 23, 2021 1 2 "
"February 22, 2021 1 2 "
"February 21, 2021 1,234,567 123,456 "
"Only showing the last 7 days "
""
"Messages sent within 10 seconds "
"98.31% on average "
"Messages sent within 10 seconds "
"Date Percentage "
"27 February 2021 98.60% "
"26 February 2021 100.00% "
"25 February 2021 99.99% "
"24 February 2021 100.00% "
"23 February 2021 95.00% "
"22 February 2021 95.30% "
"21 February 2021 99.25% "
"February 27, 2021 98.60% "
"February 26, 2021 100.00% "
"February 25, 2021 99.99% "
"February 24, 2021 100.00% "
"February 23, 2021 95.00% "
"February 22, 2021 95.30% "
"February 21, 2021 99.25% "
"Only showing the last 7 days "
""
"Organizations using Notify "

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

@@ -2030,7 +2030,7 @@ def test_create_job_should_call_api(
_expected_status=200,
)
assert original_file_name in page.text
assert "Message status" in page.text
mock_create_job.assert_called_with(
job_id,