pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #944 from dod-ccpo/app-settings-bug

Browse Source 
Some environments might not have associated users.
This commit is contained in:
dandds 2019-06-19 11:25:11 -04:00 committed by GitHub
commit c60baf0709
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
atst/routes/applications/settings.py
View File

@ -21,8 +21,8 @@ def get_environments_obj_for_app(application):
"id": env.id, "id": env.id,
"name": env.name, "name": env.name,
"edit_form": EditEnvironmentForm(obj=env), "edit_form": EditEnvironmentForm(obj=env),
"member_count": len(env.users), "member_count": len(env.roles),
"members": [user.full_name for user in env.users], "members": [env_role.application_role.user_name for env_role in env.roles],
} }
environments_obj.append(env_data) environments_obj.append(env_data)

13
tests/routes/applications/test_settings.py
View File

@ -1,15 +1,7 @@
import pytest import pytest
from flask import url_for, get_flashed_messages from flask import url_for, get_flashed_messages
from tests.factories import ( from tests.factories import *
UserFactory,
PortfolioFactory,
PortfolioRoleFactory,
EnvironmentRoleFactory,
EnvironmentFactory,
ApplicationFactory,
ApplicationRoleFactory,
)
from atst.domain.applications import Applications from atst.domain.applications import Applications
from atst.domain.environment_roles import EnvironmentRoles from atst.domain.environment_roles import EnvironmentRoles
@ -102,7 +94,8 @@ def test_edit_application_environments_obj(app, client, user_session):
env_role1 = EnvironmentRoleFactory.create( env_role1 = EnvironmentRoleFactory.create(
application_role=app_role1, environment=env, role=CSPRole.BASIC_ACCESS.value application_role=app_role1, environment=env, role=CSPRole.BASIC_ACCESS.value
) )
app_role2 = ApplicationRoleFactory.create(application=application) app_role2 = ApplicationRoleFactory.create(application=application, user=None)
invite = ApplicationInvitationFactory.create(role=app_role2)
env_role2 = EnvironmentRoleFactory.create( env_role2 = EnvironmentRoleFactory.create(
application_role=app_role2, environment=env, role=CSPRole.NETWORK_ADMIN.value application_role=app_role2, environment=env, role=CSPRole.NETWORK_ADMIN.value
) )