darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-14 02:09:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts from main

Browse Source
This commit is contained in:
Alex Janousek
2025-09-26 14:10:08 -04:00
parent e552d95702 60b7f9149e
commit 2ba2ba6f86
6 changed files with 123 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/app/main/views/test_job_notification_updates.py
View File

@@ -16,14 +16,7 @@ from tests import job_json, user_json
@pytest.mark.parametrize(
(
"delivered",
"failed",
"pending",
"finished",
"js_should_update_notifications",
"reason",
),
("delivered", "failed", "pending", "finished", "js_should_update_notifications", "reason"),
[
(20, 10, 70, False, True, "30 messages processed (≤50 threshold)"),
(40, 10, 50, False, True, "50 messages processed (exactly at threshold)"),
@@ -141,13 +134,7 @@ def test_poll_status_provides_required_fields(
data = json.loads(response.get_data(as_text=True))
required_fields = {
"sent_count",
"failed_count",
"finished",
"pending_count",
"total_count",
}
required_fields = {"sent_count", "failed_count", "finished", "pending_count", "total_count"}
assert set(data.keys()) == required_fields
response_size = len(response.get_data(as_text=True))

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

@@ -830,6 +830,7 @@ def test_choose_a_template_to_copy_from_folder_within_service(
"sms",
"Should appear in list (at same level)",
parent=PARENT_FOLDER_ID,
template_id=TEMPLATE_ONE_ID,
),
_template(
"sms",
@@ -878,23 +879,20 @@ def test_choose_a_template_to_copy_from_folder_within_service(
service_id=SERVICE_ONE_ID,
from_folder=FOLDER_TWO_ID,
)
# assert links[1]["href"] == url_for(
# "main.choose_template_to_copy",
# service_id=SERVICE_ONE_ID,
# from_service=SERVICE_ONE_ID,
# from_folder=PARENT_FOLDER_ID,
# )
# assert links[2]["href"] == url_for(
# "main.choose_template_to_copy",
# service_id=SERVICE_ONE_ID,
# from_folder=FOLDER_TWO_ID,
# )
# assert links[3]["href"] == url_for(
# "main.copy_template",
# service_id=SERVICE_ONE_ID,
# template_id=TEMPLATE_ONE_ID,
# from_service=SERVICE_ONE_ID,
# )
assert links[1]["href"] == url_for(
"main.copy_template",
service_id=SERVICE_ONE_ID,
template_id=TEMPLATE_ONE_ID,
from_service=SERVICE_ONE_ID,
)
assert links[2]["href"] == url_for(
"main.copy_template",
service_id=SERVICE_ONE_ID,
template_id=TEMPLATE_ONE_ID,
from_service=SERVICE_ONE_ID,
)
@pytest.mark.parametrize(