Merge pull request #488 from dod-ccpo/workspace-role-change-bug-#162345640

Workspace role change bug #162345640

tests/domain/test_environments.py

@@ -38,7 +38,7 @@ def test_update_environment_roles():
     ]
 
     workspace_role = workspace.members[0]
-    Environments.update_environment_roles(
+    assert Environments.update_environment_roles(
         owner, workspace, workspace_role, new_ids_and_roles
     )
     new_dev_env_role = EnvironmentRoles.get(workspace_role.user.id, dev_env.id)
@@ -89,7 +89,7 @@ def test_remove_environment_role():
     ]
 
     workspace_role = WorkspaceRoles.get(workspace.id, developer.id)
-    Environments.update_environment_roles(
+    assert Environments.update_environment_roles(
         owner, workspace, workspace_role, new_environment_roles
     )
 
@@ -99,6 +99,35 @@ def test_remove_environment_role():
     assert EnvironmentRoles.get(developer.id, still_fa).role == "financial_auditor"
 
 
+def test_no_update_to_environment_roles():
+    owner = UserFactory.create()
+    developer = UserFactory.from_atat_role("developer")
+
+    workspace = WorkspaceFactory.create(
+        owner=owner,
+        members=[{"user": developer, "role_name": "developer"}],
+        projects=[
+            {
+                "name": "project1",
+                "environments": [
+                    {
+                        "name": "project1 dev",
+                        "members": [{"user": developer, "role_name": "devops"}],
+                    }
+                ],
+            }
+        ],
+    )
+
+    dev_env = workspace.projects[0].environments[0]
+    new_ids_and_roles = [{"id": dev_env.id, "role": "devops"}]
+
+    workspace_role = WorkspaceRoles.get(workspace.id, developer.id)
+    assert not Environments.update_environment_roles(
+        owner, workspace, workspace_role, new_ids_and_roles
+    )
+
+
 def test_get_scoped_environments(db):
     developer = UserFactory.create()
     workspace = WorkspaceFactory.create(

tests/routes/workspaces/test_members.py

@@ -93,6 +93,7 @@ def test_update_member_workspace_role(client, user_session):
         follow_redirects=True,
     )
     assert response.status_code == 200
+    assert b"role updated successfully" in response.data
     assert member.role_name == "security_auditor"
 
 
@@ -140,6 +141,8 @@ def test_update_member_environment_role(client, user_session):
         follow_redirects=True,
     )
     assert response.status_code == 200
+    assert b"role updated successfully" not in response.data
+    assert b"access successfully changed" in response.data
     assert EnvironmentRoles.get(user.id, env1_id).role == "security_auditor"
     assert EnvironmentRoles.get(user.id, env2_id).role == "devops"
 
@@ -167,6 +170,7 @@ def test_update_member_environment_role_with_no_data(client, user_session):
         follow_redirects=True,
     )
     assert response.status_code == 200
+    assert b"access successfully changed" not in response.data
     assert EnvironmentRoles.get(user.id, env1_id).role == "developer"