diff --git a/atst/forms/fields.py b/atst/forms/fields.py index 584aeca8..84f4cd1e 100644 --- a/atst/forms/fields.py +++ b/atst/forms/fields.py @@ -1,29 +1,4 @@ -from wtforms.fields import Field, FormField, StringField, SelectField as SelectField_ -from wtforms.widgets import TextArea - - -class NewlineListField(Field): - widget = TextArea() - - def _value(self): - if isinstance(self.data, list): - return "\n".join(self.data) - elif self.data: - return self.data - else: - return "" - - def process_formdata(self, valuelist): - if valuelist: - self.data = [l.strip() for l in valuelist[0].split("\n") if l] - else: - self.data = [] - - def process_data(self, value): - if isinstance(value, list): - self.data = "\n".join(value) - else: - self.data = value +from wtforms.fields import FormField, SelectField as SelectField_ class SelectField(SelectField_): @@ -33,14 +8,6 @@ class SelectField(SelectField_): super().__init__(*args, **kwargs) -class NumberStringField(StringField): - def process_data(self, value): - if isinstance(value, int): - self.data = str(value) - else: - self.data = value - - class FormFieldWrapper(FormField): def has_changes(self): if not self.object_data: diff --git a/tests/forms/test_fields.py b/tests/forms/test_fields.py index 8e6f4002..bdae6c85 100644 --- a/tests/forms/test_fields.py +++ b/tests/forms/test_fields.py @@ -4,41 +4,7 @@ from wtforms.fields import StringField import pendulum from werkzeug.datastructures import ImmutableMultiDict -from atst.forms.fields import NewlineListField, FormFieldWrapper - - -class NewlineListForm(Form): - newline_list = NewlineListField() - - -@pytest.mark.parametrize( - "input_,expected", - [ - ("", []), - ("hello", ["hello"]), - ("hello\n", ["hello"]), - ("hello\nworld", ["hello", "world"]), - ("hello\nworld\n", ["hello", "world"]), - ], -) -def test_newline_list_process(input_, expected): - form_data = ImmutableMultiDict({"newline_list": input_}) - form = NewlineListForm(form_data) - - assert form.validate() - assert form.data == {"newline_list": expected} - - -@pytest.mark.parametrize( - "input_,expected", - [([], ""), (["hello"], "hello"), (["hello", "world"], "hello\nworld")], -) -def test_newline_list_value(input_, expected): - form_data = {"newline_list": input_} - form = NewlineListForm(data=form_data) - - assert form.validate() - assert form.newline_list._value() == expected +from atst.forms.fields import FormFieldWrapper class PersonForm(Form):