fix: ROOT_URLCONF session fixture, error=None cleanup in form tests

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: fsecada01

tests/integration/conftest.py

@@ -14,12 +14,13 @@
 settings modules.
 
 The ROOT_URLCONF setting differs: unit tests don't set it, integration tests
-need it. We patch it in a session-scoped fixture below so that the integration
-URL routing works in both cases.
+need it. The session-scoped fixture below ensures ROOT_URLCONF is set for all
+integration tests regardless of which conftest configured Django first.
 """
 import os
 
 import django
+import pytest
 from django.conf import settings
 
 
@@ -30,3 +31,16 @@ def pytest_configure(config):
             "tests.integration.cotton_app.settings",
         )
         django.setup()
+
+
+@pytest.fixture(scope="session", autouse=True)
+def _set_root_urlconf():
+    """Ensure ROOT_URLCONF is set for integration URL routing."""
+    original = getattr(settings, "ROOT_URLCONF", None)
+    settings.ROOT_URLCONF = "tests.integration.cotton_app.urls"
+    yield
+    if original is None:
+        if hasattr(settings, "ROOT_URLCONF"):
+            delattr(settings, "ROOT_URLCONF")
+    else:
+        settings.ROOT_URLCONF = original

tests/unit/jinja/test_forms.py

@@ -3,14 +3,14 @@
 
 def test_form_field_renders_label(render):
     html = render("FormField.jinja", name="email", label="Email Address",
-                  value="", error=None, type="text", required=False, extra_class="")
+                  value="", error="", type="text", required=False, extra_class="")
     assert "Email Address" in html
     assert '<label class="label"' in html
 
 
 def test_form_field_renders_input(render):
     html = render("FormField.jinja", name="email", label="Email",
-                  value="test@example.com", error=None, type="email",
+                  value="test@example.com", error="", type="email",
                   required=False, extra_class="")
     assert 'name="email"' in html
     assert 'type="email"' in html
@@ -28,20 +28,20 @@ def test_form_field_shows_error(render):
 
 def test_form_field_no_error_omits_danger(render):
     html = render("FormField.jinja", name="email", label="Email",
-                  value="", error=None, type="text", required=False, extra_class="")
+                  value="", error="", type="text", required=False, extra_class="")
     assert "is-danger" not in html
 
 
 def test_form_field_required_attribute(render):
     html = render("FormField.jinja", name="email", label="Email",
-                  value="", error=None, type="text", required=True, extra_class="")
+                  value="", error="", type="text", required=True, extra_class="")
     assert "required" in html
 
 
 def test_select_renders_options(render):
     options = [{"value": "a", "label": "Option A"}, {"value": "b", "label": "Option B"}]
     html = render("Select.jinja", name="choice", label="Choose",
-                  value="a", error=None, options=options, extra_class="")
+                  value="a", error="", options=options, extra_class="")
     assert "Option A" in html
     assert "Option B" in html
     assert 'value="a"' in html
@@ -57,7 +57,7 @@ def test_select_shows_error(render):
 
 def test_textarea_renders_value(render):
     html = render("Textarea.jinja", name="bio", label="Bio",
-                  value="Hello world", error=None, rows=4, extra_class="")
+                  value="Hello world", error="", rows=4, extra_class="")
     assert "Hello world" in html
     assert 'name="bio"' in html
     assert 'rows="4"' in html
@@ -73,7 +73,7 @@ def test_textarea_shows_error(render):
 def test_checkbox_group_renders_choices(render):
     choices = [{"value": "a", "label": "Apple"}, {"value": "b", "label": "Banana"}]
     html = render("CheckboxGroup.jinja", name="fruits", label="Fruits",
-                  choices=choices, selected=["a"], error=None, extra_class="")
+                  choices=choices, selected=["a"], error="", extra_class="")
     assert "Apple" in html
     assert "Banana" in html
     assert 'value="a"' in html
@@ -83,7 +83,7 @@ def test_checkbox_group_renders_choices(render):
 def test_checkbox_group_unchecked_item(render):
     choices = [{"value": "a", "label": "Apple"}, {"value": "b", "label": "Banana"}]
     html = render("CheckboxGroup.jinja", name="fruits", label="Fruits",
-                  choices=choices, selected=["a"], error=None, extra_class="")
+                  choices=choices, selected=["a"], error="", extra_class="")
     assert html.count("checked") == 1