Lots more cleanup.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
This commit is contained in:
Cliff Hill
2024-02-21 13:47:04 -05:00
parent a118b16eb8
commit e9f9a3c6f1
14 changed files with 57 additions and 54 deletions

View File

@@ -25,7 +25,7 @@ from app.dao.users_dao import (
update_user_password,
user_can_be_archived,
)
from app.enums import AuthType
from app.enums import AuthType, PermissionType
from app.errors import InvalidRequest
from app.models import User, VerifyCode
from tests.app.db import (
@@ -208,14 +208,14 @@ def test_dao_archive_user(sample_user, sample_organization, fake_uuid):
service_1 = create_service(service_name="Service 1")
service_1_user = create_user(email="1@test.com")
service_1.users = [sample_user, service_1_user]
create_permissions(sample_user, service_1, "manage_settings")
create_permissions(service_1_user, service_1, "manage_settings", "view_activity")
create_permissions(sample_user, service_1, PermissionType.MANAGE_SETTINGS)
create_permissions(service_1_user, service_1, PermissionType.MANAGE_SETTINGS, PermissionType.VIEW_ACTIVITY,)
service_2 = create_service(service_name="Service 2")
service_2_user = create_user(email="2@test.com")
service_2.users = [sample_user, service_2_user]
create_permissions(sample_user, service_2, "view_activity")
create_permissions(service_2_user, service_2, "manage_settings")
create_permissions(sample_user, service_2, PermissionType.VIEW_ACTIVITY)
create_permissions(service_2_user, service_2, PermissionType.MANAGE_SETTINGS)
# make sample_user an org member
sample_organization.users = [sample_user]
@@ -265,10 +265,10 @@ def test_user_can_be_archived_if_the_other_service_members_have_the_manage_setti
sample_service.users = [user_1, user_2, user_3]
create_permissions(user_1, sample_service, "manage_settings")
create_permissions(user_2, sample_service, "manage_settings", "view_activity")
create_permissions(user_1, sample_service, PermissionType.MANAGE_SETTINGS)
create_permissions(user_2, sample_service, PermissionType.MANAGE_SETTINGS, PermissionType.VIEW_ACTIVITY,)
create_permissions(
user_3, sample_service, "manage_settings", "send_emails", "send_texts"
user_3, sample_service, PermissionType.MANAGE_SETTINGS, PermissionType.SEND_EMAILS, PermissionType.SEND_TEXTS,
)
assert len(sample_service.users) == 3
@@ -304,9 +304,9 @@ def test_user_cannot_be_archived_if_the_other_service_members_do_not_have_the_ma
sample_service.users = [active_user, pending_user, inactive_user]
create_permissions(active_user, sample_service, "manage_settings")
create_permissions(pending_user, sample_service, "view_activity")
create_permissions(inactive_user, sample_service, "send_emails", "send_texts")
create_permissions(active_user, sample_service, PermissionType.MANAGE_SETTINGS)
create_permissions(pending_user, sample_service, PermissionType.VIEW_ACTIVITY)
create_permissions(inactive_user, sample_service, PermissionType.SEND_EMAILS, PermissionType.SEND_TEXTS,)
assert len(sample_service.users) == 3
assert not user_can_be_archived(active_user)