pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed repetitive code in tests

Browse Source
This commit is contained in:
Montana 2018-12-04 16:20:40 -05:00
parent 9ddac1fa61
commit a4caf98ef7
2 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/models/test_workspace_role.py
View File

@ -199,67 +199,62 @@ def test_status_when_member_is_active():
def test_status_when_invitation_has_been_rejected_for_expirations():
workspace = WorkspaceFactory.create()
user = UserFactory.create()
ws_role = WorkspaceRoleFactory.create(
workspace_role = WorkspaceRoleFactory.create(
workspace=workspace, user=user, status=WorkspaceRoleStatus.PENDING
)
invitation = InvitationFactory.create(
workspace_role=ws_role, status=InvitationStatus.REJECTED_EXPIRED
workspace_role=workspace_role, status=InvitationStatus.REJECTED_EXPIRED
)
workspace_role = WorkspaceRoleFactory.create(invitations=[invitation])
assert workspace_role.display_status == "Invite expired"
def test_status_when_invitation_has_been_rejected_for_wrong_user():
workspace = WorkspaceFactory.create()
user = UserFactory.create()
ws_role = WorkspaceRoleFactory.create(
workspace_role = WorkspaceRoleFactory.create(
workspace=workspace, user=user, status=WorkspaceRoleStatus.PENDING
)
invitation = InvitationFactory.create(
workspace_role=ws_role, status=InvitationStatus.REJECTED_WRONG_USER
workspace_role=workspace_role, status=InvitationStatus.REJECTED_WRONG_USER
)
workspace_role = WorkspaceRoleFactory.create(invitations=[invitation])
assert workspace_role.display_status == "Error on invite"
def test_status_when_invitation_is_expired():
workspace = WorkspaceFactory.create()
user = UserFactory.create()
ws_role = WorkspaceRoleFactory.create(
workspace_role = WorkspaceRoleFactory.create(
workspace=workspace, user=user, status=WorkspaceRoleStatus.PENDING
)
invitation = InvitationFactory.create(
workspace_role=ws_role,
workspace_role=workspace_role,
status=InvitationStatus.PENDING,
expiration_time=datetime.datetime.now() - datetime.timedelta(seconds=1),
)
workspace_role = WorkspaceRoleFactory.create(invitations=[invitation])
assert workspace_role.display_status == "Invite expired"
def test_can_not_resend_invitation_if_active():
workspace = WorkspaceFactory.create()
user = UserFactory.create()
ws_role = WorkspaceRoleFactory.create(
workspace_role = WorkspaceRoleFactory.create(
workspace=workspace, user=user, status=WorkspaceRoleStatus.PENDING
)
invitation = InvitationFactory.create(
workspace_role=ws_role, status=InvitationStatus.ACCEPTED
workspace_role=workspace_role, status=InvitationStatus.ACCEPTED
)
workspace_role = WorkspaceRoleFactory.create(invitations=[invitation])
assert not workspace_role.can_resend_invitation
def test_can_resend_invitation_if_expired():
workspace = WorkspaceFactory.create()
user = UserFactory.create()
ws_role = WorkspaceRoleFactory.create(
workspace_role = WorkspaceRoleFactory.create(
workspace=workspace, user=user, status=WorkspaceRoleStatus.PENDING
)
invitation = InvitationFactory.create(
workspace_role=ws_role, status=InvitationStatus.REJECTED_EXPIRED
workspace_role=workspace_role, status=InvitationStatus.REJECTED_EXPIRED
)
workspace_role = WorkspaceRoleFactory.create(invitations=[invitation])
assert workspace_role.can_resend_invitation

17
tests/routes/workspaces/test_invitations.py
View File

@ -19,9 +19,7 @@ def test_existing_member_accepts_valid_invite(client, user_session):
ws_role = WorkspaceRoleFactory.create(
workspace=workspace, user=user, status=WorkspaceRoleStatus.PENDING
)
invite = InvitationFactory.create(
user_id=user.id, workspace_role=ws_role, workspace_role_id=ws_role.id
)
invite = InvitationFactory.create(user_id=user.id, workspace_role=ws_role)
# the user does not have access to the workspace before accepting the invite
assert len(Workspaces.for_user(user)) == 0
@ -79,7 +77,6 @@ def test_member_accepts_invalid_invite(client, user_session):
invite = InvitationFactory.create(
user_id=user.id,
workspace_role=ws_role,
workspace_role_id=ws_role.id,
status=InvitationStatus.REJECTED_WRONG_USER,
)
user_session(user)
@ -112,9 +109,7 @@ def test_user_accepts_invite_with_wrong_dod_id(client, user_session):
ws_role = WorkspaceRoleFactory.create(
user=user, workspace=workspace, status=WorkspaceRoleStatus.PENDING
)
invite = InvitationFactory.create(
user_id=user.id, workspace_role=ws_role, workspace_role_id=ws_role.id
)
invite = InvitationFactory.create(user_id=user.id, workspace_role=ws_role)
user_session(different_user)
response = client.get(url_for("workspaces.accept_invitation", token=invite.token))
@ -130,7 +125,6 @@ def test_user_accepts_expired_invite(client, user_session):
invite = InvitationFactory.create(
user_id=user.id,
workspace_role=ws_role,
workspace_role_id=ws_role.id,
status=InvitationStatus.REJECTED_EXPIRED,
expiration_time=datetime.datetime.now() - datetime.timedelta(seconds=1),
)
@ -149,7 +143,6 @@ def test_revoke_invitation(client, user_session):
invite = InvitationFactory.create(
user_id=user.id,
workspace_role=ws_role,
workspace_role_id=ws_role.id,
status=InvitationStatus.REJECTED_EXPIRED,
expiration_time=datetime.datetime.now() - datetime.timedelta(seconds=1),
)
@ -173,10 +166,7 @@ def test_resend_invitation_sends_email(client, user_session, queue):
user=user, workspace=workspace, status=WorkspaceRoleStatus.PENDING
)
invite = InvitationFactory.create(
user_id=user.id,
workspace_role=ws_role,
workspace_role_id=ws_role.id,
status=InvitationStatus.PENDING,
user_id=user.id, workspace_role=ws_role, status=InvitationStatus.PENDING
)
user_session(workspace.owner)
client.post(
@ -201,7 +191,6 @@ def test_existing_member_invite_resent_to_email_submitted_in_form(
invite = InvitationFactory.create(
user_id=user.id,
workspace_role=ws_role,
workspace_role_id=ws_role.id,
status=InvitationStatus.PENDING,
email="example@example.com",
)