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

formatting

Browse Source
This commit is contained in:
Montana
2018-11-21 13:15:45 -05:00
parent 8cc9a21770
commit 78f3495c3f
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
atst/models/workspace_role.py
View File

@@ -35,8 +35,7 @@ class WorkspaceRole(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
UUID(as_uuid=True), ForeignKey("users.id"), index=True, nullable=False UUID(as_uuid=True), ForeignKey("users.id"), index=True, nullable=False
) )
status = Column( status = Column(SQLAEnum(Status, native_enum=False), default=Status.PENDING)
SQLAEnum(Status, native_enum=False), default=Status.PENDING)
def __repr__(self): def __repr__(self):
return "<WorkspaceRole(role='{}', workspace='{}', user_id='{}', id='{}')>".format( return "<WorkspaceRole(role='{}', workspace='{}', user_id='{}', id='{}')>".format(

17
tests/models/test_workspace_role.py
View File

@@ -37,17 +37,18 @@ def test_has_role_history(session):
user = UserFactory.create() user = UserFactory.create()
workspace = Workspaces.create(RequestFactory.create(creator=owner)) workspace = Workspaces.create(RequestFactory.create(creator=owner))
role = session.query(Role).filter(Role.name == 'developer').one() role = session.query(Role).filter(Role.name == "developer").one()
# in order to get the history, we don't want the WorkspaceRoleFactory # in order to get the history, we don't want the WorkspaceRoleFactory
# to commit after create() # to commit after create()
WorkspaceRoleFactory._meta.sqlalchemy_session_persistence = 'flush' WorkspaceRoleFactory._meta.sqlalchemy_session_persistence = "flush"
workspace_role = WorkspaceRoleFactory.create(workspace=workspace, user=user, role=role) workspace_role = WorkspaceRoleFactory.create(
workspace=workspace, user=user, role=role
)
WorkspaceRoles.update_role(workspace_role, "admin") WorkspaceRoles.update_role(workspace_role, "admin")
changed_events = ( changed_events = (
session.query(AuditEvent) session.query(AuditEvent)
.filter( .filter(
AuditEvent.resource_id == workspace_role.id, AuditEvent.resource_id == workspace_role.id, AuditEvent.action == "update"
AuditEvent.action == 'update',
) )
.all() .all()
) )
@@ -56,7 +57,6 @@ def test_has_role_history(session):
assert changed_events[0].changed_state["role"][1] == "admin" assert changed_events[0].changed_state["role"][1] == "admin"
def test_has_status_history(session): def test_has_status_history(session):
owner = UserFactory.create() owner = UserFactory.create()
user = UserFactory.create() user = UserFactory.create()
@@ -64,14 +64,13 @@ def test_has_status_history(session):
workspace = Workspaces.create(RequestFactory.create(creator=owner)) workspace = Workspaces.create(RequestFactory.create(creator=owner))
# in order to get the history, we don't want the WorkspaceRoleFactory # in order to get the history, we don't want the WorkspaceRoleFactory
# to commit after create() # to commit after create()
WorkspaceRoleFactory._meta.sqlalchemy_session_persistence = 'flush' WorkspaceRoleFactory._meta.sqlalchemy_session_persistence = "flush"
workspace_role = WorkspaceRoleFactory.create(workspace=workspace, user=user) workspace_role = WorkspaceRoleFactory.create(workspace=workspace, user=user)
WorkspaceRoles.enable(workspace_role) WorkspaceRoles.enable(workspace_role)
changed_events = ( changed_events = (
session.query(AuditEvent) session.query(AuditEvent)
.filter( .filter(
AuditEvent.resource_id == workspace_role.id, AuditEvent.resource_id == workspace_role.id, AuditEvent.action == "update"
AuditEvent.action == 'update',
) )
.all() .all()
) )