Move display status logic to be a property of an ApplicationRole

2019-11-19 10:43:11 -05:00
parent 9f90f5abbd
commit 58a0b2dd9d
4 changed files with 48 additions and 15 deletions
--- a/tests/routes/applications/test_settings.py
+++ b/tests/routes/applications/test_settings.py
@@ -23,8 +23,11 @@ from atst.routes.applications.settings import (
    filter_env_roles_form_data,
    filter_env_roles_data,
    get_environments_obj_for_app,
+<<<<<<< HEAD
    handle_create_member,
    handle_update_member,
+=======
+>>>>>>> Move display status logic to be a property of an ApplicationRole
 )

 from tests.utils import captured_templates