darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-04-18 08:10:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Changes for sqlalchemy 2.0

Browse Source
This commit is contained in:
Aditi Anand
2024-04-24 16:27:20 -04:00
parent df2a590f1a
commit ad55eef5e9
14 changed files with 160 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/app/dao/test_fact_billing_dao.py
View File

@@ -838,7 +838,7 @@ def test_fetch_sms_billing_for_all_services_with_remainder(notify_db_session):
},
]
assert [dict(result) for result in results] == expected_results
assert [result._asdict() for result in results] == expected_results
def test_fetch_sms_billing_for_all_services_without_an_organization_appears(
@@ -893,7 +893,7 @@ def test_fetch_sms_billing_for_all_services_without_an_organization_appears(
},
]
assert [dict(result) for result in results] == expected_results
assert [result._asdict() for result in results] == expected_results
@freeze_time("2019-06-01 13:30")
@@ -1228,8 +1228,8 @@ def test_query_organization_sms_usage_for_year_handles_multiple_services(
result = query_organization_sms_usage_for_year(org.id, 2022).all()
service_1_rows = [row for row in result if row.service_id == service_1.id]
service_2_rows = [row for row in result if row.service_id == service_2.id]
service_1_rows = [row._asdict() for row in result if row.service_id == service_1.id]
service_2_rows = [row._asdict() for row in result if row.service_id == service_2.id]
assert len(service_1_rows) == 2
assert len(service_2_rows) == 2
@@ -1256,10 +1256,10 @@ def test_query_organization_sms_usage_for_year_handles_multiple_services(
# assert total costs are accurate
assert (
float(sum(row.cost for row in service_1_rows)) == 1
float(sum(row["cost"] for row in service_1_rows)) == 1
) # rows with 2 and 4, allowance of 5
assert (
float(sum(row.cost for row in service_2_rows)) == 14
float(sum(row["cost"] for row in service_2_rows)) == 14
) # rows with 8 and 16, allowance of 10
@@ -1296,7 +1296,10 @@ def test_query_organization_sms_usage_for_year_handles_multiple_rates(
financial_year_start=current_year,
)
result = query_organization_sms_usage_for_year(org.id, 2022).all()
result = [
row._asdict()
for row in query_organization_sms_usage_for_year(org.id, 2022).all()
]
# al lthe free allowance is used on the first day
assert result[0]["local_date"] == date(2022, 4, 29)

2
tests/app/template_folder/test_template_folder_rest.py
View File

@@ -237,7 +237,7 @@ def test_update_template_folder_users(admin_request, sample_service):
[
({}, "name is a required property"),
({"name": None}, "name None is not of type string"),
({"name": ""}, "name is too short"),
({"name": ""}, "name should be non-empty"),
],
)
def test_update_template_folder_fails_if_missing_name(

4
tests/app/webauthn/test_rest.py
View File

@@ -89,7 +89,7 @@ def test_create_webauthn_credential_returns_201(admin_request, sample_user):
"name None is not of type string",
),
# name is empty
({"name": "", "credential_data": "ABC123"}, "name is too short"),
({"name": "", "credential_data": "ABC123"}, "name should be non-empty"),
],
)
def test_create_webauthn_credential_errors_if_schema_violation(
@@ -131,7 +131,7 @@ def test_update_webauthn_credential_returns_200(admin_request, sample_user):
# name is null
({"name": None}, "name None is not of type string"),
# name is empty
({"name": ""}, "name is too short"),
({"name": ""}, "name should be non-empty"),
],
)
def test_update_webauthn_credential_errors_if_schema_violation(