forms: simplify code and improve test

JohaJung · JohaJung · commit 12c147ca3d74 · 2025-04-25T18:57:44.000+02:00
make the response more likely to be a real-world response
diff --git a/tests/test_forms.py b/tests/test_forms.py
@@ -288,26 +288,33 @@ def test_textarea_emptyfirstline(self):
 class TestFormLint(unittest.TestCase):
 
     def test_form_lint(self):
-        form = webtest.Form(None, '''<form>
+        def _build_response(html):
+            return webtest.TestResponse('<body>{}</body>'.format(html))
+
+        html = '''<form>
         <input type="text" name="field"/>
-        </form>''')
+        </form>'''
+        form = webtest.Form(_build_response(html), html)
         self.assertRaises(AttributeError, form.lint)
 
-        form = webtest.Form(None, '''<form>
+        html = '''<form>
         <input type="text" id="myfield" name="field"/>
-        </form>''')
+        </form>'''
+        form = webtest.Form(_build_response(html), html)
         self.assertRaises(AttributeError, form.lint)
 
-        form = webtest.Form(None, '''<form>
+        html = '''<form>
         <label for="myfield">my field</label>
         <input type="text" id="myfield" name="field"/>
-        </form>''')
+        </form>'''
+        form = webtest.Form(_build_response(html), html)
         form.lint()
 
-        form = webtest.Form(None, '''<form>
+        html = '''<form>
         <label class="field" for="myfield" role="r">my field</label>
         <input type="text" id="myfield" name="field"/>
-        </form>''')
+        </form>'''
+        form = webtest.Form(_build_response(html), html)
         form.lint()
 
 
diff --git a/webtest/forms.py b/webtest/forms.py
@@ -433,12 +433,10 @@ def _parse_fields(self):
         field_order = []
         tags = ('input', 'select', 'textarea', 'button')
         inner_elts = self.html.find_all(tags)
-        if self.response:
-            def _form_elt_filter(tag):
-                return tag in inner_elts or tag.attrs.get('form') == self.id
-            elements = self.response.html.find_all(_form_elt_filter)
-        else:
-            elements = inner_elts
+        def _form_elt_filter(tag):
+            return tag in inner_elts or (
+                tag.attrs.get('form') == self.id and tag.name in tags)
+        elements = self.response.html.find_all(_form_elt_filter)
         for pos, node in enumerate(elements):
             attrs = dict(node.attrs)
             tag = node.name
