Handle setting no access for user environment roles:

- use constant for no access string
- update no access constant
- update language and permissions for rendering remove app member button

tests/routes/applications/test_settings.py

@@ -18,11 +18,11 @@ from atst.domain.environments import Environments
 from atst.domain.permission_sets import PermissionSets
 from atst.domain.portfolios import Portfolios
 from atst.domain.exceptions import NotFoundError
-
 from atst.models.environment_role import CSPRole
 from atst.models.portfolio_role import Status as PortfolioRoleStatus
 from atst.forms.application import EditEnvironmentForm
 from atst.forms.app_settings import AppEnvRolesForm
+from atst.forms.data import ENV_ROLE_NO_ACCESS as NO_ACCESS
 
 from tests.utils import captured_templates
 
@@ -166,7 +166,7 @@ def test_data_for_app_env_roles_form(app, client, user_session):
                     "env_id": env.id,
                     "team_roles": [
                         {
-                            "role": "no_access",
+                            "role": NO_ACCESS,
                             "members": [
                                 {
                                     "user_id": str(app_role.user_id),
@@ -309,7 +309,7 @@ def test_update_team_env_roles(client, user_session):
         "envs-0-team_roles-1-members-1-user_id": env_role_2.user.id,
         "envs-0-team_roles-1-members-1-role_name": CSPRole.BASIC_ACCESS.value,
         "envs-0-team_roles-1-members-2-user_id": env_role_3.user.id,
-        "envs-0-team_roles-1-members-2-role_name": "no_access",
+        "envs-0-team_roles-1-members-2-role_name": NO_ACCESS,
     }
 
     user_session(application.portfolio.owner)

tests/routes/applications/test_team.py

@@ -4,6 +4,7 @@ from flask import url_for
 
 from atst.domain.permission_sets import PermissionSets
 from atst.models import CSPRole
+from atst.forms.data import ENV_ROLE_NO_ACCESS as NO_ACCESS
 
 from tests.factories import *
 
@@ -120,8 +121,7 @@ def test_update_team_environment_roles(client, user_session):
     assert env_role.role == CSPRole.TECHNICAL_READ.value
 
 
-@pytest.mark.skip(reason="Need to rebase against master")
-def test_update_team_revoke_environment_access(client, user_session):
+def test_update_team_revoke_environment_access(client, user_session, db, session):
     application = ApplicationFactory.create()
     owner = application.portfolio.owner
     app_role = ApplicationRoleFactory.create(
@@ -141,12 +141,13 @@ def test_update_team_revoke_environment_access(client, user_session):
             "members-0-permission_sets-perms_env_mgmt": PermissionSets.EDIT_APPLICATION_ENVIRONMENTS,
             "members-0-permission_sets-perms_del_env": PermissionSets.DELETE_APPLICATION_ENVIRONMENTS,
             "members-0-environment_roles-0-environment_id": environment.id,
-            "members-0-environment_roles-0-role": "",
+            "members-0-environment_roles-0-role": NO_ACCESS,
         },
     )
 
     assert response.status_code == 302
-    assert env_role.role == CSPRole.TECHNICAL_READ.value
+    env_role_exists = db.exists().where(EnvironmentRole.id == env_role.id)
+    assert not session.query(env_role_exists).scalar()
 
 
 def test_create_member(client, user_session):