Refactor tests

This commit is contained in:
leigh-mil 2018-12-19 11:30:51 -05:00
parent 54a88a9b94
commit 3ff86a1a6e

View File

@ -16,6 +16,26 @@ from atst.models.workspace_role import Status as WorkspaceRoleStatus
from atst.models.invitation import Status as InvitationStatus from atst.models.invitation import Status as InvitationStatus
def create_workspace_and_invite_user(
ws_role="developer",
ws_status=WorkspaceRoleStatus.PENDING,
invite_status=InvitationStatus.PENDING,
):
workspace = WorkspaceFactory.create()
if ws_role != "owner":
user = UserFactory.create()
member = WorkspaceRoleFactory.create(
user=user, workspace=workspace, status=ws_status
)
InvitationFactory.create(
user=workspace.owner,
workspace_role=member,
email=member.user.email,
status=invite_status,
)
return workspace
def test_user_with_permission_has_add_member_link(client, user_session): def test_user_with_permission_has_add_member_link(client, user_session):
workspace = WorkspaceFactory.create() workspace = WorkspaceFactory.create()
user_session(workspace.owner) user_session(workspace.owner)
@ -220,18 +240,11 @@ def test_does_not_show_any_buttons_if_owner(client, user_session):
def test_only_shows_revoke_access_button_if_active(client, user_session): def test_only_shows_revoke_access_button_if_active(client, user_session):
workspace = WorkspaceFactory.create() workspace = create_workspace_and_invite_user(
user = UserFactory.create() ws_status=WorkspaceRoleStatus.ACTIVE, invite_status=InvitationStatus.ACCEPTED
member = WorkspaceRoleFactory.create(
user=user, workspace=workspace, status=WorkspaceRoleStatus.ACTIVE
)
InvitationFactory.create(
user=workspace.owner,
workspace_role=member,
email=member.user.email,
status=InvitationStatus.ACCEPTED,
) )
user_session(workspace.owner) user_session(workspace.owner)
member = workspace.members[1]
response = client.get( response = client.get(
url_for( url_for(
"workspaces.view_member", "workspaces.view_member",
@ -245,14 +258,11 @@ def test_only_shows_revoke_access_button_if_active(client, user_session):
def test_only_shows_revoke_invite_button_if_pending(client, user_session): def test_only_shows_revoke_invite_button_if_pending(client, user_session):
workspace = WorkspaceFactory.create() workspace = create_workspace_and_invite_user(
member = WorkspaceRoleFactory.create( ws_status=WorkspaceRoleStatus.PENDING, invite_status=InvitationStatus.PENDING
workspace=workspace, status=WorkspaceRoleStatus.PENDING
)
InvitationFactory.create(
user=workspace.owner, workspace_role=member, email=member.user.email
) )
user_session(workspace.owner) user_session(workspace.owner)
member = workspace.members[1]
response = client.get( response = client.get(
url_for( url_for(
"workspaces.view_member", "workspaces.view_member",
@ -266,15 +276,12 @@ def test_only_shows_revoke_invite_button_if_pending(client, user_session):
def test_only_shows_resend_button_if_expired(client, user_session): def test_only_shows_resend_button_if_expired(client, user_session):
workspace = WorkspaceFactory.create() workspace = create_workspace_and_invite_user(
member = WorkspaceRoleFactory.create(workspace=workspace) ws_status=WorkspaceRoleStatus.PENDING,
InvitationFactory.create( invite_status=InvitationStatus.REJECTED_EXPIRED,
user=workspace.owner,
workspace_role=member,
email=member.user.email,
status=InvitationStatus.REJECTED_EXPIRED,
) )
user_session(workspace.owner) user_session(workspace.owner)
member = workspace.members[1]
response = client.get( response = client.get(
url_for( url_for(
"workspaces.view_member", "workspaces.view_member",
@ -288,15 +295,11 @@ def test_only_shows_resend_button_if_expired(client, user_session):
def test_only_shows_resend_button_if_revoked(client, user_session): def test_only_shows_resend_button_if_revoked(client, user_session):
workspace = WorkspaceFactory.create() workspace = create_workspace_and_invite_user(
member = WorkspaceRoleFactory.create(workspace=workspace) ws_status=WorkspaceRoleStatus.PENDING, invite_status=InvitationStatus.REVOKED
InvitationFactory.create(
user=workspace.owner,
workspace_role=member,
email=member.user.email,
status=InvitationStatus.REVOKED,
) )
user_session(workspace.owner) user_session(workspace.owner)
member = workspace.members[1]
response = client.get( response = client.get(
url_for( url_for(
"workspaces.view_member", "workspaces.view_member",