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

Cleaning up tests.

Browse Source 
Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
This commit is contained in:
Cliff Hill
2024-01-16 14:46:17 -05:00
parent 9523cc1d97
commit 8c6046b03b
33 changed files with 268 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/app/service/test_api_key_endpoints.py
View File

@@ -3,7 +3,8 @@ import json
from flask import url_for
from app.dao.api_key_dao import expire_api_key
from app.models import KEY_TYPE_NORMAL, ApiKey
from app.enums import KeyType
from app.models import ApiKey
from tests import create_admin_authorization_header
from tests.app.db import create_api_key, create_service, create_user
@@ -14,7 +15,7 @@ def test_api_key_should_create_new_api_key_for_service(notify_api, sample_servic
data = {
"name": "some secret name",
"created_by": str(sample_service.created_by.id),
"key_type": KEY_TYPE_NORMAL,
"key_type": KeyType.NORMAL,
}
auth_header = create_admin_authorization_header()
response = client.post(
@@ -86,7 +87,7 @@ def test_api_key_should_create_multiple_new_api_key_for_service(
data = {
"name": "some secret name",
"created_by": str(sample_service.created_by.id),
"key_type": KEY_TYPE_NORMAL,
"key_type": KeyType.NORMAL,
}
auth_header = create_admin_authorization_header()
response = client.post(

21
tests/app/service/test_rest.py
View File

@@ -14,22 +14,17 @@ from app.dao.service_user_dao import dao_get_service_user
from app.dao.services_dao import dao_add_user_to_service, dao_remove_user_from_service
from app.dao.templates_dao import dao_redact_template
from app.dao.users_dao import save_model_user
from app.enums import KeyType, ServicePermissionType, TemplateType, NotificationType
from app.models import (
KEY_TYPE_NORMAL,
KEY_TYPE_TEAM,
KEY_TYPE_TEST,
AnnualBilling,
EmailBranding,
InboundNumber,
Notification,
NotificationType,
Permission,
Service,
ServiceEmailReplyTo,
ServicePermission,
ServicePermissionType,
ServiceSmsSender,
TemplateType,
User,
)
from tests import create_admin_authorization_header
@@ -1882,7 +1877,7 @@ def test_get_all_notifications_for_service_including_ones_made_by_jobs(
mock_s3.return_value = "1"
# notification from_test_api_key
create_notification(sample_template, key_type=KEY_TYPE_TEST)
create_notification(sample_template, key_type=KeyType.TEST)
auth_header = create_admin_authorization_header()
@@ -2081,7 +2076,7 @@ def test_get_services_with_detailed_flag(client, sample_template):
notifications = [
create_notification(sample_template),
create_notification(sample_template),
create_notification(sample_template, key_type=KEY_TYPE_TEST),
create_notification(sample_template, key_type=KeyType.TEST),
]
resp = client.get(
"/service?detailed=True", headers=[create_admin_authorization_header()]
@@ -2101,11 +2096,11 @@ def test_get_services_with_detailed_flag(client, sample_template):
def test_get_services_with_detailed_flag_excluding_from_test_key(
client, sample_template
):
create_notification(sample_template, key_type=KEY_TYPE_NORMAL)
create_notification(sample_template, key_type=KEY_TYPE_TEAM)
create_notification(sample_template, key_type=KEY_TYPE_TEST)
create_notification(sample_template, key_type=KEY_TYPE_TEST)
create_notification(sample_template, key_type=KEY_TYPE_TEST)
create_notification(sample_template, key_type=KeyType.NORMAL)
create_notification(sample_template, key_type=KeyType.TEAM)
create_notification(sample_template, key_type=KeyType.TEST)
create_notification(sample_template, key_type=KeyType.TEST)
create_notification(sample_template, key_type=KeyType.TEST)
resp = client.get(
"/service?detailed=True&include_from_test_key=False",