From 78f3495c3fa5c699691c2b622b13850da9b5606f Mon Sep 17 00:00:00 2001 From: Montana Date: Wed, 21 Nov 2018 13:15:45 -0500 Subject: [PATCH] formatting --- atst/models/workspace_role.py | 3 +-- tests/models/test_workspace_role.py | 17 ++++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/atst/models/workspace_role.py b/atst/models/workspace_role.py index 30cebf9f..21d17a90 100644 --- a/atst/models/workspace_role.py +++ b/atst/models/workspace_role.py @@ -35,8 +35,7 @@ class WorkspaceRole(Base, mixins.TimestampsMixin, mixins.AuditableMixin): UUID(as_uuid=True), ForeignKey("users.id"), index=True, nullable=False ) - status = Column( - SQLAEnum(Status, native_enum=False), default=Status.PENDING) + status = Column(SQLAEnum(Status, native_enum=False), default=Status.PENDING) def __repr__(self): return "".format( diff --git a/tests/models/test_workspace_role.py b/tests/models/test_workspace_role.py index 796814db..dd77db93 100644 --- a/tests/models/test_workspace_role.py +++ b/tests/models/test_workspace_role.py @@ -37,17 +37,18 @@ def test_has_role_history(session): user = UserFactory.create() 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 # to commit after create() - WorkspaceRoleFactory._meta.sqlalchemy_session_persistence = 'flush' - workspace_role = WorkspaceRoleFactory.create(workspace=workspace, user=user, role=role) + WorkspaceRoleFactory._meta.sqlalchemy_session_persistence = "flush" + workspace_role = WorkspaceRoleFactory.create( + workspace=workspace, user=user, role=role + ) WorkspaceRoles.update_role(workspace_role, "admin") changed_events = ( session.query(AuditEvent) .filter( - AuditEvent.resource_id == workspace_role.id, - AuditEvent.action == 'update', + AuditEvent.resource_id == workspace_role.id, AuditEvent.action == "update" ) .all() ) @@ -56,7 +57,6 @@ def test_has_role_history(session): assert changed_events[0].changed_state["role"][1] == "admin" - def test_has_status_history(session): owner = UserFactory.create() user = UserFactory.create() @@ -64,14 +64,13 @@ def test_has_status_history(session): workspace = Workspaces.create(RequestFactory.create(creator=owner)) # in order to get the history, we don't want the WorkspaceRoleFactory # to commit after create() - WorkspaceRoleFactory._meta.sqlalchemy_session_persistence = 'flush' + WorkspaceRoleFactory._meta.sqlalchemy_session_persistence = "flush" workspace_role = WorkspaceRoleFactory.create(workspace=workspace, user=user) WorkspaceRoles.enable(workspace_role) changed_events = ( session.query(AuditEvent) .filter( - AuditEvent.resource_id == workspace_role.id, - AuditEvent.action == 'update', + AuditEvent.resource_id == workspace_role.id, AuditEvent.action == "update" ) .all() )