mirror of
https://github.com/GSA/notifications-api.git
synced 2026-02-02 17:31:14 -05:00
merge from main
This commit is contained in:
@@ -7,7 +7,8 @@ from flask import current_app
|
||||
from freezegun import freeze_time
|
||||
from notifications_utils.url_safe_token import generate_token
|
||||
|
||||
from app.models import EMAIL_AUTH_TYPE, SMS_AUTH_TYPE, Notification
|
||||
from app.enums import AuthType, InvitedUserStatus
|
||||
from app.models import Notification
|
||||
from tests import create_admin_authorization_header
|
||||
from tests.app.db import create_invited_user
|
||||
|
||||
@@ -39,7 +40,7 @@ def test_create_invited_user(
|
||||
email_address=email_address,
|
||||
from_user=str(invite_from.id),
|
||||
permissions="send_messages,manage_service,manage_api_keys",
|
||||
auth_type=EMAIL_AUTH_TYPE,
|
||||
auth_type=AuthType.EMAIL,
|
||||
folder_permissions=["folder_1", "folder_2", "folder_3"],
|
||||
**extra_args,
|
||||
)
|
||||
@@ -58,7 +59,7 @@ def test_create_invited_user(
|
||||
json_resp["data"]["permissions"]
|
||||
== "send_messages,manage_service,manage_api_keys"
|
||||
)
|
||||
assert json_resp["data"]["auth_type"] == EMAIL_AUTH_TYPE
|
||||
assert json_resp["data"]["auth_type"] == AuthType.EMAIL
|
||||
assert json_resp["data"]["id"]
|
||||
assert json_resp["data"]["folder_permissions"] == [
|
||||
"folder_1",
|
||||
@@ -110,7 +111,7 @@ def test_create_invited_user_without_auth_type(
|
||||
_expected_status=201,
|
||||
)
|
||||
|
||||
assert json_resp["data"]["auth_type"] == SMS_AUTH_TYPE
|
||||
assert json_resp["data"]["auth_type"] == AuthType.SMS
|
||||
|
||||
|
||||
def test_create_invited_user_invalid_email(client, sample_service, mocker, fake_uuid):
|
||||
@@ -164,7 +165,7 @@ def test_get_all_invited_users_by_service(client, notify_db_session, sample_serv
|
||||
for invite in json_resp["data"]:
|
||||
assert invite["service"] == str(sample_service.id)
|
||||
assert invite["from_user"] == str(invite_from.id)
|
||||
assert invite["auth_type"] == SMS_AUTH_TYPE
|
||||
assert invite["auth_type"] == AuthType.SMS
|
||||
assert invite["id"]
|
||||
|
||||
|
||||
@@ -226,12 +227,12 @@ def test_resend_expired_invite(
|
||||
|
||||
assert response.status_code == 200
|
||||
json_resp = json.loads(response.get_data(as_text=True))["data"]
|
||||
assert json_resp["status"] == "pending"
|
||||
assert json_resp["status"] == InvitedUserStatus.PENDING
|
||||
assert mock_send.called
|
||||
|
||||
|
||||
def test_update_invited_user_set_status_to_cancelled(client, sample_invited_user):
|
||||
data = {"status": "cancelled"}
|
||||
data = {"status": InvitedUserStatus.CANCELLED}
|
||||
url = f"/service/{sample_invited_user.service_id}/invite/{sample_invited_user.id}"
|
||||
auth_header = create_admin_authorization_header()
|
||||
response = client.post(
|
||||
@@ -242,13 +243,13 @@ def test_update_invited_user_set_status_to_cancelled(client, sample_invited_user
|
||||
|
||||
assert response.status_code == 200
|
||||
json_resp = json.loads(response.get_data(as_text=True))["data"]
|
||||
assert json_resp["status"] == "cancelled"
|
||||
assert json_resp["status"] == InvitedUserStatus.CANCELLED
|
||||
|
||||
|
||||
def test_update_invited_user_for_wrong_service_returns_404(
|
||||
client, sample_invited_user, fake_uuid
|
||||
):
|
||||
data = {"status": "cancelled"}
|
||||
data = {"status": InvitedUserStatus.CANCELLED}
|
||||
url = f"/service/{fake_uuid}/invite/{sample_invited_user.id}"
|
||||
auth_header = create_admin_authorization_header()
|
||||
response = client.post(
|
||||
|
||||
Reference in New Issue
Block a user