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

try to fix test code

Browse Source
This commit is contained in:
Kenneth Kehl
2024-10-10 14:55:39 -07:00
parent 97237f8e5d
commit 79d666f570
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.ds.baseline
View File

@@ -239,7 +239,7 @@
"filename": "tests/app/dao/test_services_dao.py", "filename": "tests/app/dao/test_services_dao.py",
"hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
"is_verified": false, "is_verified": false,
"line_number": 290, "line_number": 289,
"is_secret": false "is_secret": false
} }
], ],
@@ -384,5 +384,5 @@
} }
] ]
}, },
"generated_at": "2024-10-10T21:35:38Z" "generated_at": "2024-10-10T21:55:35Z"
} }

27
tests/app/dao/test_services_dao.py
View File

@@ -92,12 +92,12 @@ from tests.app.db import (
def _get_service_query_count(): def _get_service_query_count():
stmt = select(func.count(Service.id)) stmt = select(func.count(Service.id))
return db.session.execute(stmt).scalar() return db.session.execute(stmt).scalar() or 0
def _get_service_history_query_count(): def _get_service_history_query_count():
stmt = select(Service.get_history_model()) stmt = select(Service.get_history_model())
return db.session.execute(stmt).scalar() return db.session.execute(stmt).scalar() or 0
def _get_first_service(): def _get_first_service():
@@ -110,7 +110,6 @@ def _get_service_by_id(service_id):
stmt = select(Service).filter(Service.id == service_id) stmt = select(Service).filter(Service.id == service_id)
service = db.session.execute(stmt).scalars().one() service = db.session.execute(stmt).scalars().one()
print(f"SERVICE Is {service}")
return service return service
@@ -880,30 +879,30 @@ def test_delete_service_and_associated_objects(notify_db_session):
delete_service_and_all_associated_db_objects(service) delete_service_and_all_associated_db_objects(service)
stmt = select(VerifyCode) stmt = select(VerifyCode)
assert db.session.execute(stmt).scalar() == 0 assert db.session.execute(stmt).scalar() is None
stmt = select(ApiKey) stmt = select(ApiKey)
assert db.session.execute(stmt).scalar() == 0 assert db.session.execute(stmt).scalar() is None
stmt = select(ApiKey.get_history_model()) stmt = select(ApiKey.get_history_model())
assert db.session.execute(stmt).scalar() == 0 assert db.session.execute(stmt).scalar() is None
stmt = select(Template) stmt = select(Template)
assert db.session.execute(stmt).scalar() == 0 assert db.session.execute(stmt).scalar() is None
stmt = select(TemplateHistory) stmt = select(TemplateHistory)
assert db.session.execute(stmt).scalar() == 0 assert db.session.execute(stmt).scalar() is None
stmt = select(Job) stmt = select(Job)
assert db.session.execute(stmt).scalar() == 0 assert db.session.execute(stmt).scalar() is None
stmt = select(Notification) stmt = select(Notification)
assert db.session.execute(stmt).scalar() == 0 assert db.session.execute(stmt).scalar() is None
stmt = select(Permission) stmt = select(Permission)
assert db.session.execute(stmt).scalar() == 0 assert db.session.execute(stmt).scalar() is None
stmt = select(User) stmt = select(User)
assert db.session.execute(stmt).scalar() == 0 assert db.session.execute(stmt).scalar() is None
stmt = select(InvitedUser) stmt = select(InvitedUser)
assert db.session.execute(stmt).scalar() == 0 assert db.session.execute(stmt).scalar() is None
assert _get_service_query_count() == 0 assert _get_service_query_count() == 0
assert _get_service_history_query_count() == 0 assert _get_service_history_query_count() == 0
stmt = select(ServicePermission) stmt = select(ServicePermission)
assert db.session.execute(stmt).scalar() == 0 assert db.session.execute(stmt).scalar() is None
# the organization hasn't been deleted # the organization hasn't been deleted
stmt = select(Organization) stmt = select(Organization)