Add tests for new form options

Author: fangpenlin

tests/test_renderer.py

@@ -118,3 +118,37 @@ def test_wrapper_options(
         '/html/body/div[@class="mb-3"]/div[@class="offset-3" and @attr="MOCK_ATTR"]/'
         'input[@name="submit"]'
     )
+
+
+def test_form_options(
+    renderer_context: RendererContext,
+    form: MockForm,
+    parse_html: typing.Callable[[str], etree._ElementTree],
+):
+    html = renderer_context.form(
+        method="MOCK_METHOD",
+        action="MOCK_ACTION",
+        enctype="MOCK_ENCTYPE",
+        form_class="MOCK_CLASS",
+        form_attrs=dict(mock_attr="MOCK_VALUE"),
+    ).render(form)
+    tree = parse_html(html)
+    # Notice: lxml parser will add html and body automatically in the tree
+    form = tree.xpath("/html/body/form")[0]
+    assert form.attrib["method"] == "MOCK_METHOD"
+    assert form.attrib["action"] == "MOCK_ACTION"
+    assert form.attrib["enctype"] == "MOCK_ENCTYPE"
+    assert form.attrib["class"] == "MOCK_CLASS"
+    assert form.attrib["mock_attr"] == "MOCK_VALUE"
+
+
+def test_form_options_disable(
+    renderer_context: RendererContext,
+    form: MockForm,
+    parse_html: typing.Callable[[str], etree._ElementTree],
+):
+    html = renderer_context.form(form_enabled=False).render(form)
+    tree = parse_html(html)
+    # Notice: lxml parser will add html and body automatically in the tree
+    assert not tree.xpath("/html/body/form")
+    assert tree.xpath('/html/body/div/input[@name="email"]')

wtforms_bootstrap5/context.py

@@ -116,15 +116,16 @@ def __init__(
 
     def form(self, **kwargs) -> RendererContext:
         old_options = dataclasses.asdict(self.form_options)
-        self.form_options = FormOptions(old_options | kwargs)
+        self.form_options = FormOptions(**(old_options | kwargs))
+        return self
 
     def field(self, *names: str, **kwargs: str) -> RendererContext:
         for name in names:
             old_options = dataclasses.asdict(
                 self.field_options.get(name, self.default_field_options)
             )
             self.field_options[name] = FieldOptions(**(old_options | kwargs))
-            return self
+        return self
 
     def default_field(self, **kwargs: str) -> RendererContext:
         self.default_field_options = FieldOptions(

wtforms_bootstrap5/renderers.py

@@ -48,15 +48,29 @@ def wrap_with(
     if class_name is not None:
         kwargs["class"] = class_name
     kwargs.update(attrs)
-    return Markup(f"<{tag}{html_params(**kwargs)}>{html}</div>")
+    return Markup(f"<{tag}{html_params(**kwargs)}>{html}</{tag}>")
 
 
 @register(target_cls=Form)
 def render_form(context: RendererContext, element: FormElement) -> Markup:
     form: Form = element
+    form_options = context.form_options
     fields = [context.render(field) for field in form._fields.values()]
-    # TODO: add form action, method and other stuff
-    return Markup("<form>" + "\n".join(fields) + "</form>")
+    content = "\n".join(fields)
+    base_attrs = {}
+    if form_options.action is not None:
+        base_attrs["action"] = form_options.action
+    if form_options.method is not None:
+        base_attrs["method"] = form_options.method
+    if form_options.enctype is not None:
+        base_attrs["enctype"] = form_options.enctype
+    return wrap_with(
+        content,
+        enabled=form_options.form_enabled,
+        class_name=form_options.form_class,
+        attrs=base_attrs | form_options.form_attrs,
+        tag="form",
+    )
 
 
 @register(target_cls=Field)