Consolidate WorkspaceUser into WorkspaceRole
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
from atst.domain.workspace_users import WorkspaceUsers
|
||||
from atst.domain.workspace_roles import WorkspaceRoles
|
||||
from atst.domain.users import Users
|
||||
from atst.models.workspace_role import Status as WorkspaceRoleStatus
|
||||
from atst.domain.roles import Roles
|
||||
@@ -11,40 +11,34 @@ from tests.factories import (
|
||||
)
|
||||
|
||||
|
||||
def test_can_create_new_workspace_user():
|
||||
def test_can_create_new_workspace_role():
|
||||
workspace = WorkspaceFactory.create()
|
||||
new_user = UserFactory.create()
|
||||
|
||||
workspace_user_dicts = [{"id": new_user.id, "workspace_role": "owner"}]
|
||||
workspace_users = WorkspaceUsers.add_many(workspace.id, workspace_user_dicts)
|
||||
workspace_role_dicts = [{"id": new_user.id, "workspace_role": "owner"}]
|
||||
workspace_roles = WorkspaceRoles.add_many(workspace.id, workspace_role_dicts)
|
||||
|
||||
assert workspace_users[0].user.id == new_user.id
|
||||
assert workspace_users[0].user.atat_role.name == new_user.atat_role.name
|
||||
assert (
|
||||
workspace_users[0].workspace_role.role.name
|
||||
== new_user.workspace_roles[0].role.name
|
||||
)
|
||||
assert workspace_roles[0].user_id == new_user.id
|
||||
assert workspace_roles[0].user.atat_role.name == new_user.atat_role.name
|
||||
assert workspace_roles[0].role.name == new_user.workspace_roles[0].role.name
|
||||
|
||||
|
||||
def test_can_update_existing_workspace_user():
|
||||
def test_can_update_existing_workspace_role():
|
||||
workspace = WorkspaceFactory.create()
|
||||
new_user = UserFactory.create()
|
||||
|
||||
WorkspaceUsers.add_many(
|
||||
WorkspaceRoles.add_many(
|
||||
workspace.id, [{"id": new_user.id, "workspace_role": "owner"}]
|
||||
)
|
||||
workspace_users = WorkspaceUsers.add_many(
|
||||
workspace_roles = WorkspaceRoles.add_many(
|
||||
workspace.id, [{"id": new_user.id, "workspace_role": "developer"}]
|
||||
)
|
||||
|
||||
assert workspace_users[0].user.atat_role.name == new_user.atat_role.name
|
||||
assert (
|
||||
workspace_users[0].workspace_role.role.name
|
||||
== new_user.workspace_roles[0].role.name
|
||||
)
|
||||
assert workspace_roles[0].user.atat_role.name == new_user.atat_role.name
|
||||
assert workspace_roles[0].role.name == new_user.workspace_roles[0].role.name
|
||||
|
||||
|
||||
def test_workspace_user_permissions():
|
||||
def test_workspace_role_permissions():
|
||||
workspace_one = WorkspaceFactory.create()
|
||||
workspace_two = WorkspaceFactory.create()
|
||||
new_user = UserFactory.create()
|
||||
@@ -61,5 +55,5 @@ def test_workspace_user_permissions():
|
||||
status=WorkspaceRoleStatus.PENDING,
|
||||
)
|
||||
|
||||
assert WorkspaceUsers.workspace_user_permissions(workspace_one, new_user)
|
||||
assert not WorkspaceUsers.workspace_user_permissions(workspace_two, new_user)
|
||||
assert WorkspaceRoles.workspace_role_permissions(workspace_one, new_user)
|
||||
assert not WorkspaceRoles.workspace_role_permissions(workspace_two, new_user)
|
||||
|
Reference in New Issue
Block a user