From c071945b3b6e5213396f397f78cee8ad8d1c4d77 Mon Sep 17 00:00:00 2001 From: Montana Date: Thu, 15 Nov 2018 10:30:21 -0500 Subject: [PATCH] Spelling error and better name use --- atst/models/workspace_role.py | 4 ++-- tests/domain/test_audit_log.py | 2 +- tests/models/test_workspace_role.py | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/atst/models/workspace_role.py b/atst/models/workspace_role.py index b23563a1..671271c2 100644 --- a/atst/models/workspace_role.py +++ b/atst/models/workspace_role.py @@ -49,8 +49,8 @@ class WorkspaceRole(Base, mixins.TimestampsMixin, mixins.AuditableMixin): if "role_id" in previous_state: from_role_id = previous_state["role_id"] from_role = db.session.query(Role).filter(Role.id == from_role_id).one() - to_role = self.role_displayname - change_set["role"] = [from_role.display_name, to_role] + to_role = self.role_name + change_set["role"] = [from_role.name, to_role] if "status" in previous_state: from_status = previous_state["status"].value to_status = self.status.value diff --git a/tests/domain/test_audit_log.py b/tests/domain/test_audit_log.py index ab03c48c..3e000dde 100644 --- a/tests/domain/test_audit_log.py +++ b/tests/domain/test_audit_log.py @@ -20,7 +20,7 @@ def test_non_admin_cannot_view_audit_log(developer): AuditLog.get_all_events(developer) -def test_ccpo_can_iview_audit_log(ccpo): +def test_ccpo_can_view_audit_log(ccpo): AuditLog.get_all_events(ccpo) diff --git a/tests/models/test_workspace_role.py b/tests/models/test_workspace_role.py index 4fd10f9d..d0b19c0c 100644 --- a/tests/models/test_workspace_role.py +++ b/tests/models/test_workspace_role.py @@ -44,8 +44,9 @@ def test_has_role_history(session): .all() ) - assert changed_events[0].changed_state["role"][0] - assert changed_events[0].changed_state["role"][1] + # changed_state["role"] returns a list [previous role, current role] + assert changed_events[0].changed_state["role"][0] == 'developer' + assert changed_events[0].changed_state["role"][1] == 'admin' def test_has_status_history(session):