From c9f654664c1200b4eaf6e6e6b25c72b6e72324ce Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Thu, 26 Sep 2019 10:18:42 -0400
Subject: [PATCH] Update test to check that env role was deleted and that the
 status changed on the app role

---
 .secrets.baseline                      |  4 ++--
 tests/domain/test_application_roles.py | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.secrets.baseline b/.secrets.baseline
index 58c395a9..3acc6dd6 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2019-09-25T09:43:11Z",
+  "generated_at": "2019-09-26T13:53:31Z",
   "plugins_used": [
     {
       "base64_limit": 4.5,
@@ -199,5 +199,5 @@
       }
     ]
   },
-  "version": "0.12.5"
+  "version": "0.12.6"
 }
diff --git a/tests/domain/test_application_roles.py b/tests/domain/test_application_roles.py
index 2f58f1e4..a91de2c1 100644
--- a/tests/domain/test_application_roles.py
+++ b/tests/domain/test_application_roles.py
@@ -1,6 +1,7 @@
 import pytest
 
 from atst.domain.application_roles import ApplicationRoles
+from atst.domain.environment_roles import EnvironmentRoles
 from atst.domain.exceptions import NotFoundError
 from atst.domain.permission_sets import PermissionSets
 from atst.models import ApplicationRoleStatus
@@ -68,19 +69,19 @@ def test_get_by_id():
         ApplicationRoles.get_by_id(app_role.id)
 
 
-def test_disable():
+def test_disable(session):
     application = ApplicationFactory.create()
     user = UserFactory.create()
-    member_role = ApplicationRoleFactory.create(application=application, user=user)
+    member_role = ApplicationRoleFactory.create(
+        application=application, user=user, status=ApplicationRoleStatus.ACTIVE
+    )
     environment = EnvironmentFactory.create(application=application)
     environment_role = EnvironmentRoleFactory.create(
         application_role=member_role, environment=environment
     )
-    assert member_role == ApplicationRoles.get(
-        user_id=user.id, application_id=application.id
-    )
+    assert member_role.status == ApplicationRoleStatus.ACTIVE
+
     ApplicationRoles.disable(member_role)
-    assert (
-        ApplicationRoles.get(user_id=user.id, application_id=application.id).status
-        == ApplicationRoleStatus.DISABLED
-    )
+    session.refresh(member_role)
+    assert member_role.status == ApplicationRoleStatus.DISABLED
+    assert not EnvironmentRoles.get_by_user_and_environment(user.id, environment.id)