More fixes for everyone.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
This commit is contained in:
Cliff Hill
2024-02-08 09:26:37 -05:00
parent 1d580df0ea
commit f43ad68329
3 changed files with 18 additions and 22 deletions

View File

@@ -58,9 +58,7 @@ def test_get_notifications_request_invalid_statuses(invalid_statuses, valid_stat
errors = json.loads(str(e.value)).get("errors")
assert len(errors) == len(invalid_statuses)
for index, value in enumerate(invalid_statuses):
assert errors[index]["message"] == "status {} {}".format(
value, partial_error_status
)
assert errors[index]["message"] == f"status {value} {partial_error_status}"
@pytest.mark.parametrize(
@@ -71,13 +69,13 @@ def test_get_notifications_request_invalid_statuses(invalid_statuses, valid_stat
# multiple invalid template_types
(["orange", "avocado", "banana"], []),
# one bad template_type and one good template_type
(["orange"], ["sms"]),
(["orange"], [TemplateType.SMS]),
],
)
def test_get_notifications_request_invalid_template_types(
invalid_template_types, valid_template_types
):
partial_error_template_type = "is not one of [sms, email]"
partial_error_template_type = "is not one of [sms, email, letter]"
with pytest.raises(ValidationError) as e:
validate(
@@ -88,8 +86,8 @@ def test_get_notifications_request_invalid_template_types(
errors = json.loads(str(e.value)).get("errors")
assert len(errors) == len(invalid_template_types)
for index, value in enumerate(invalid_template_types):
assert errors[index]["message"] == "template_type {} {}".format(
value, partial_error_template_type
assert errors[index]["message"] == (
f"template_type {value} {partial_error_template_type}"
)
@@ -97,8 +95,8 @@ def test_get_notifications_request_invalid_statuses_and_template_types():
with pytest.raises(ValidationError) as e:
validate(
{
"status": ["created", "elephant", "giraffe"],
"template_type": ["sms", "orange", "avocado"],
"status": [NotificationStatus.CREATED, "elephant", "giraffe"],
"template_type": [TemplateType.SMS, "orange", "avocado"],
},
get_notifications_request,
)
@@ -110,17 +108,15 @@ def test_get_notifications_request_invalid_statuses_and_template_types():
error_messages = [error["message"] for error in errors]
for invalid_status in ["elephant", "giraffe"]:
assert (
"status {} is not one of [cancelled, created, sending, sent, delivered, "
f"status {invalid_status} is not one of [cancelled, created, sending, sent, delivered, "
"pending, failed, technical-failure, temporary-failure, permanent-failure, "
"pending-virus-check, validation-failed, virus-scan-failed]".format(
invalid_status
)
"pending-virus-check, validation-failed, virus-scan-failed]"
in error_messages
)
for invalid_template_type in ["orange", "avocado"]:
assert (
"template_type {} is not one of [sms, email]".format(invalid_template_type)
f"template_type {invalid_template_type} is not one of [sms, email, letter]"
in error_messages
)