mirror of
https://github.com/GSA/notifications-api.git
synced 2026-02-05 02:41:14 -05:00
reformat
This commit is contained in:
@@ -18,15 +18,15 @@ from tests.app.db import create_invited_user
|
||||
|
||||
def test_create_invited_user(notify_db_session, sample_service):
|
||||
assert InvitedUser.query.count() == 0
|
||||
email_address = 'invited_user@service.gov.uk'
|
||||
email_address = "invited_user@service.gov.uk"
|
||||
invite_from = sample_service.users[0]
|
||||
|
||||
data = {
|
||||
'service': sample_service,
|
||||
'email_address': email_address,
|
||||
'from_user': invite_from,
|
||||
'permissions': 'send_messages,manage_service',
|
||||
'folder_permissions': []
|
||||
"service": sample_service,
|
||||
"email_address": email_address,
|
||||
"from_user": invite_from,
|
||||
"permissions": "send_messages,manage_service",
|
||||
"folder_permissions": [],
|
||||
}
|
||||
|
||||
invited_user = InvitedUser(**data)
|
||||
@@ -37,8 +37,8 @@ def test_create_invited_user(notify_db_session, sample_service):
|
||||
assert invited_user.from_user == invite_from
|
||||
permissions = invited_user.get_permissions()
|
||||
assert len(permissions) == 2
|
||||
assert 'send_messages' in permissions
|
||||
assert 'manage_service' in permissions
|
||||
assert "send_messages" in permissions
|
||||
assert "manage_service" in permissions
|
||||
assert invited_user.folder_permissions == []
|
||||
|
||||
|
||||
@@ -49,10 +49,10 @@ def test_create_invited_user_sets_default_folder_permissions_of_empty_list(
|
||||
invite_from = sample_service.users[0]
|
||||
|
||||
data = {
|
||||
'service': sample_service,
|
||||
'email_address': 'invited_user@service.gov.uk',
|
||||
'from_user': invite_from,
|
||||
'permissions': 'send_messages,manage_service',
|
||||
"service": sample_service,
|
||||
"email_address": "invited_user@service.gov.uk",
|
||||
"from_user": invite_from,
|
||||
"permissions": "send_messages,manage_service",
|
||||
}
|
||||
|
||||
invited_user = InvitedUser(**data)
|
||||
@@ -63,7 +63,9 @@ def test_create_invited_user_sets_default_folder_permissions_of_empty_list(
|
||||
|
||||
|
||||
def test_get_invited_user_by_service_and_id(notify_db_session, sample_invited_user):
|
||||
from_db = get_invited_user_by_service_and_id(sample_invited_user.service.id, sample_invited_user.id)
|
||||
from_db = get_invited_user_by_service_and_id(
|
||||
sample_invited_user.service.id, sample_invited_user.id
|
||||
)
|
||||
assert from_db == sample_invited_user
|
||||
|
||||
|
||||
@@ -77,13 +79,13 @@ def test_get_unknown_invited_user_returns_none(notify_db_session, sample_service
|
||||
|
||||
with pytest.raises(NoResultFound) as e:
|
||||
get_invited_user_by_service_and_id(sample_service.id, unknown_id)
|
||||
assert 'No row was found when one was required' in str(e.value)
|
||||
assert "No row was found when one was required" in str(e.value)
|
||||
|
||||
|
||||
def test_get_invited_users_for_service(notify_db_session, sample_service):
|
||||
invites = []
|
||||
for i in range(0, 5):
|
||||
email = 'invited_user_{}@service.gov.uk'.format(i)
|
||||
email = "invited_user_{}@service.gov.uk".format(i)
|
||||
|
||||
invited_user = create_invited_user(sample_service, to_email_address=email)
|
||||
invites.append(invited_user)
|
||||
@@ -94,25 +96,29 @@ def test_get_invited_users_for_service(notify_db_session, sample_service):
|
||||
assert invite in all_from_db
|
||||
|
||||
|
||||
def test_get_invited_users_for_service_that_has_no_invites(notify_db_session, sample_service):
|
||||
def test_get_invited_users_for_service_that_has_no_invites(
|
||||
notify_db_session, sample_service
|
||||
):
|
||||
invites = get_invited_users_for_service(sample_service.id)
|
||||
assert len(invites) == 0
|
||||
|
||||
|
||||
def test_save_invited_user_sets_status_to_cancelled(notify_db_session, sample_invited_user):
|
||||
def test_save_invited_user_sets_status_to_cancelled(
|
||||
notify_db_session, sample_invited_user
|
||||
):
|
||||
assert InvitedUser.query.count() == 1
|
||||
saved = InvitedUser.query.get(sample_invited_user.id)
|
||||
assert saved.status == 'pending'
|
||||
saved.status = 'cancelled'
|
||||
assert saved.status == "pending"
|
||||
saved.status = "cancelled"
|
||||
save_invited_user(saved)
|
||||
assert InvitedUser.query.count() == 1
|
||||
cancelled_invited_user = InvitedUser.query.get(sample_invited_user.id)
|
||||
assert cancelled_invited_user.status == 'cancelled'
|
||||
assert cancelled_invited_user.status == "cancelled"
|
||||
|
||||
|
||||
def test_should_delete_all_invitations_more_than_one_day_old(
|
||||
sample_user,
|
||||
sample_service):
|
||||
sample_user, sample_service
|
||||
):
|
||||
make_invitation(sample_user, sample_service, age=timedelta(hours=48))
|
||||
make_invitation(sample_user, sample_service, age=timedelta(hours=48))
|
||||
assert len(InvitedUser.query.all()) == 2
|
||||
@@ -121,12 +127,20 @@ def test_should_delete_all_invitations_more_than_one_day_old(
|
||||
|
||||
|
||||
def test_should_not_delete_invitations_less_than_two_days_old(
|
||||
sample_user, sample_service
|
||||
):
|
||||
make_invitation(
|
||||
sample_user,
|
||||
sample_service):
|
||||
make_invitation(sample_user, sample_service, age=timedelta(hours=47, minutes=59, seconds=59),
|
||||
email_address="valid@2.com")
|
||||
make_invitation(sample_user, sample_service, age=timedelta(hours=48),
|
||||
email_address="expired@1.com")
|
||||
sample_service,
|
||||
age=timedelta(hours=47, minutes=59, seconds=59),
|
||||
email_address="valid@2.com",
|
||||
)
|
||||
make_invitation(
|
||||
sample_user,
|
||||
sample_service,
|
||||
age=timedelta(hours=48),
|
||||
email_address="expired@1.com",
|
||||
)
|
||||
|
||||
assert len(InvitedUser.query.all()) == 2
|
||||
delete_invitations_created_more_than_two_days_ago()
|
||||
@@ -139,10 +153,10 @@ def make_invitation(user, service, age=None, email_address="test@test.com"):
|
||||
email_address=email_address,
|
||||
from_user=user,
|
||||
service=service,
|
||||
status='pending',
|
||||
status="pending",
|
||||
created_at=datetime.utcnow() - (age or timedelta(hours=0)),
|
||||
permissions='manage_settings',
|
||||
folder_permissions=[str(uuid.uuid4())]
|
||||
permissions="manage_settings",
|
||||
folder_permissions=[str(uuid.uuid4())],
|
||||
)
|
||||
db.session.add(verify_code)
|
||||
db.session.commit()
|
||||
|
||||
Reference in New Issue
Block a user