Merge pull request #267 from JohaJung/html5_form_attr

gawel · web-flow · commit fae253d8f8b3 · 2025-04-25T23:45:18.000+02:00
support HTML5 `form` attribute
diff --git a/tests/html/form_inputs.html b/tests/html/form_inputs.html
@@ -55,5 +55,11 @@
             <button name="action" type="submit" value="activate">Activate</button>
         </form>
 
+        <input name="foo" type="text" value="early" form="outer_inputs_form">
+        <form method="POST" id="outer_inputs_form">
+            <input name="bar" type="text" value="bar">
+        </form>
+        <input name="button" type="submit" value="text" form="outer_inputs_form">
+
     </body>
 </html>
diff --git a/tests/test_forms.py b/tests/test_forms.py
@@ -134,6 +134,9 @@ def test_button_submit_by_value_and_index(self):
                           form.submit, "action", value="activate",
                           index=0)
 
+    def test_outer_inputs(self):
+        form = self.callFUT(formid='outer_inputs_form')
+        self.assertEqual(('foo', 'bar', 'button'), tuple(form.fields))
 
 class TestResponseFormAttribute(unittest.TestCase):
 
@@ -285,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
@@ -432,7 +432,12 @@ def _parse_fields(self):
         fields = OrderedDict()
         field_order = []
         tags = ('input', 'select', 'textarea', 'button')
-        for pos, node in enumerate(self.html.find_all(tags)):
+        inner_elts = self.html.find_all(tags)
+        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
             name = None
