From c329e5ffcf7c98cbfa16050801d8fb2f684d4a56 Mon Sep 17 00:00:00 2001 From: Montana Date: Tue, 21 May 2019 10:37:03 -0400 Subject: [PATCH] Use No Access as default role value for app users -adds unit tests for EnvironmentForm -removes unused import from forms/team.py --- atst/forms/application_member.py | 6 ++--- tests/forms/test_application_member.py | 36 ++++++++++++++++++++++++++ tests/forms/test_team.py | 1 - 3 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 tests/forms/test_application_member.py diff --git a/atst/forms/application_member.py b/atst/forms/application_member.py index 1e13d896..bba2b164 100644 --- a/atst/forms/application_member.py +++ b/atst/forms/application_member.py @@ -3,9 +3,9 @@ from wtforms.fields import FormField, FieldList, HiddenField, BooleanField from .forms import BaseForm from .member import NewForm as BaseNewMemberForm -from .data import ENV_ROLES -from atst.forms.fields import SelectField +from .data import ENV_ROLES, ENV_ROLE_NO_ACCESS as NO_ACCESS from atst.domain.permission_sets import PermissionSets +from atst.forms.fields import SelectField from atst.utils.localization import translate @@ -15,7 +15,7 @@ class EnvironmentForm(FlaskForm): role = SelectField( environment_name, choices=ENV_ROLES, - default=None, + default=NO_ACCESS, filters=[lambda x: None if x == "None" else x], ) diff --git a/tests/forms/test_application_member.py b/tests/forms/test_application_member.py new file mode 100644 index 00000000..a315d642 --- /dev/null +++ b/tests/forms/test_application_member.py @@ -0,0 +1,36 @@ +from wtforms.validators import ValidationError + +from atst.forms.data import ENV_ROLES, ENV_ROLE_NO_ACCESS as NO_ACCESS +from atst.forms.application_member import * + + +def test_environment_form(): + form_data = { + "environment_id": 123, + "environment_name": "testing", + "role": ENV_ROLES[0][0], + } + form = EnvironmentForm(data=form_data) + assert form.validate() + + +def test_environment_form_default_no_access(): + form_data = {"environment_id": 123, "environment_name": "testing"} + form = EnvironmentForm(data=form_data) + + assert form.validate() + assert form.data == { + "environment_id": 123, + "environment_name": "testing", + "role": NO_ACCESS, + } + + +def test_environment_form_invalid(): + form_data = { + "environment_id": 123, + "environment_name": "testing", + "role": "not a real choice", + } + form = EnvironmentForm(data=form_data) + assert not form.validate() diff --git a/tests/forms/test_team.py b/tests/forms/test_team.py index c5990698..39dce8fa 100644 --- a/tests/forms/test_team.py +++ b/tests/forms/test_team.py @@ -1,5 +1,4 @@ from wtforms.validators import ValidationError -import pytest from atst.domain.permission_sets import PermissionSets from atst.forms.team import *