8000 Fix RadioField required attribute by owgreen · Pull Request #615 · pallets-eco/wtforms · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix RadioField required attribute #615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 27, 2021
Merged

Fix RadioField required attribute #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9741f9d
fix radiofield required bug
Jun 1, 2020
46d18f0
add test
owgreen Oct 5, 2020
79018cc
move test
owgreen Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/wtforms/fields/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,11 @@ def iter_choices(self):

def __iter__(self):
opts = dict(
widget=self.option_widget, name=self.name, _form=None, _meta=self.meta
widget=self.option_widget,
validators=self.validators,
name=self.name,
_form=None,
_meta=self.meta,
)
for i, (value, label, checked) in enumerate(self.iter_choices()):
opt = self._Option(label=label, id="%s-%d" % (self.id, i), **opts)
Expand Down
28 changes: 28 additions & 0 deletions tests/fields/test_radio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
from tests.common import DummyPostData

from wtforms import validators
from wtforms.fields import RadioField
from wtforms.form import Form

Expand All @@ -9,6 +12,10 @@ def make_form(name="F", **fields):
class F(Form):
a = RadioField(choices=[("a", "hello"), ("b", "bye")], default="a")
b = RadioField(choices=[(1, "Item 1"), (2, "Item 2")], coerce=int)
c = RadioField(
choices=[("a", "Item 1"), ("b", "Item 2")],
validators=[validators.InputRequired()],
)


def test_radio_field():
Expand Down Expand Up @@ -74,3 +81,24 @@ class F(Form):
'<label for="a-1">bye</label></li>'
"</ul>"
)


def test_required_flag():
form = F()
assert form.c() == (
'<ul id="c">'
'<li><input id="c-0" name="c" required type="radio" value="a"> '
'<label for="c-0">Item 1</label></li>'
'<li><input id="c-1" name="c" required type="radio" value="b"> '
'<label for="c-1">Item 2</label></li>'
"</ul>"
)


def test_required_validator():
form = F(DummyPostData(b=1, c="a"))
assert form.validate()
assert form.c.errors == []
form = F(DummyPostData(b=1))
assert form.validate() is False
assert form.c.errors == ["This field is required."]
32 changes: 32 additions & 0 deletions tests/fields/test_select.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import pytest
from tests.common import DummyPostData

from wtforms import validators
from wtforms import widgets
from wtforms.fields import SelectField
from wtforms.form import Form
Expand Down Expand Up @@ -163,3 +164,34 @@ def choices():
'<option value="foo">foo</option>',
'<option selected value="bar">bar</option>',
]


def test_requried_flag():
F = make_form(
c=SelectField(
choices=[("a", "hello"), ("b", "bye")],
validators=[validators.InputRequired()],
)
)
form = F(DummyPostData(c="a"))
assert form.c() == (
'<select id="c" name="c" required>'
'<option selected value="a">hello</option>'
'<option value="b">bye</option>'
"</select>"
)


def test_required_validator():
F = make_form(
c=SelectField(
choices=[("a", "hello"), ("b", "bye")],
validators=[validators.InputRequired()],
)
)
form = F(DummyPostData(c="b"))
assert form.validate()
assert form.c.errors == []
form = F()
assert form.validate() is False
assert form.c.errors == ["This field is required."]
32 changes: 32 additions & 0 deletions tests/fields/test_selectmultiple.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import pytest
from tests.common import DummyPostData

from wtforms import validators
from wtforms.fields import SelectField
from wtforms.fields import SelectMultipleField
from wtforms.form import Form
Expand Down Expand Up @@ -103,3 +104,34 @@ def test_dont_validate_choices():
assert form.validate()
assert form.a.data == ["b"]
assert len(form.a.errors) == 0


def test_requried_flag():
F = make_form(
c=SelectMultipleField(
choices=[("a", "hello"), ("b", "bye")],
validators=[validators.InputRequired()],
)
)
form = F(DummyPostData(c=["a"]))
assert form.c() == (
'<select id="c" multiple name="c" required>'
'<option selected value="a">hello</option>'
'<option value="b">bye</option>'
"</select>"
)


def test_required_validator():
F = make_form(
c=SelectMultipleField(
choices=[("a", "hello"), ("b", "bye")],
validators=[validators.InputRequired()],
)
)
form = F(DummyPostData(c=["a"]))
assert form.validate()
assert form.c.errors == []
form = F()
assert form.validate() is False
assert form.c.errors == ["This field is required."]
0