summaryrefslogtreecommitdiff
path: root/tests/forms_tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests/forms_tests')
-rw-r--r--tests/forms_tests/tests/__init__.py4
-rw-r--r--tests/forms_tests/tests/test_forms.py99
-rw-r--r--tests/forms_tests/tests/test_formsets.py100
3 files changed, 110 insertions, 93 deletions
diff --git a/tests/forms_tests/tests/__init__.py b/tests/forms_tests/tests/__init__.py
index 193a7149a1..1878eaf6e5 100644
--- a/tests/forms_tests/tests/__init__.py
+++ b/tests/forms_tests/tests/__init__.py
@@ -11,6 +11,8 @@ except ImportError:
def jinja2_tests(test_func):
test_func = skipIf(jinja2 is None, "this test requires jinja2")(test_func)
return override_settings(
- FORM_RENDERER="django.forms.renderers.Jinja2",
+ # RemovedInDjango50Warning: When the deprecation ends, revert to
+ # FORM_RENDERER="django.forms.renderers.Jinja2",
+ FORM_RENDERER="django.forms.renderers.Jinja2DivFormRenderer",
TEMPLATES={"BACKEND": "django.template.backends.jinja2.Jinja2"},
)(test_func)
diff --git a/tests/forms_tests/tests/test_forms.py b/tests/forms_tests/tests/test_forms.py
index e6e396c8a1..ec911ee961 100644
--- a/tests/forms_tests/tests/test_forms.py
+++ b/tests/forms_tests/tests/test_forms.py
@@ -42,8 +42,9 @@ from django.forms.utils import ErrorList
from django.http import QueryDict
from django.template import Context, Template
from django.test import SimpleTestCase
-from django.test.utils import override_settings
+from django.test.utils import isolate_lru_cache, override_settings
from django.utils.datastructures import MultiValueDict
+from django.utils.deprecation import RemovedInDjango50Warning
from django.utils.safestring import mark_safe
from . import jinja2_tests
@@ -149,17 +150,12 @@ class FormsTestCase(SimpleTestCase):
)
self.assertHTMLEqual(
str(p),
- """
- <tr><th><label for="id_first_name">First name:</label></th><td>
- <input type="text" name="first_name" value="John" id="id_first_name"
- required></td></tr>
- <tr><th><label for="id_last_name">Last name:</label></th><td>
- <input type="text" name="last_name" value="Lennon" id="id_last_name"
- required></td></tr>
- <tr><th><label for="id_birthday">Birthday:</label></th><td>
- <input type="text" name="birthday" value="1940-10-9" id="id_birthday"
- required></td></tr>
- """,
+ '<div><label for="id_first_name">First name:</label><input type="text" '
+ 'name="first_name" value="John" required id="id_first_name"></div><div>'
+ '<label for="id_last_name">Last name:</label><input type="text" '
+ 'name="last_name" value="Lennon" required id="id_last_name"></div><div>'
+ '<label for="id_birthday">Birthday:</label><input type="text" '
+ 'name="birthday" value="1940-10-9" required id="id_birthday"></div>',
)
self.assertHTMLEqual(
p.as_div(),
@@ -182,15 +178,15 @@ class FormsTestCase(SimpleTestCase):
self.assertEqual(p.cleaned_data, {})
self.assertHTMLEqual(
str(p),
- """<tr><th><label for="id_first_name">First name:</label></th><td>
-<ul class="errorlist"><li>This field is required.</li></ul>
-<input type="text" name="first_name" id="id_first_name" required></td></tr>
-<tr><th><label for="id_last_name">Last name:</label></th>
-<td><ul class="errorlist"><li>This field is required.</li></ul>
-<input type="text" name="last_name" id="id_last_name" required></td></tr>
-<tr><th><label for="id_birthday">Birthday:</label></th><td>
-<ul class="errorlist"><li>This field is required.</li></ul>
-<input type="text" name="birthday" id="id_birthday" required></td></tr>""",
+ '<div><label for="id_first_name">First name:</label>'
+ '<ul class="errorlist"><li>This field is required.</li></ul>'
+ '<input type="text" name="first_name" required id="id_first_name"></div>'
+ '<div><label for="id_last_name">Last name:</label>'
+ '<ul class="errorlist"><li>This field is required.</li></ul>'
+ '<input type="text" name="last_name" required id="id_last_name"></div><div>'
+ '<label for="id_birthday">Birthday:</label>'
+ '<ul class="errorlist"><li>This field is required.</li></ul>'
+ '<input type="text" name="birthday" required id="id_birthday"></div>',
)
self.assertHTMLEqual(
p.as_table(),
@@ -261,12 +257,12 @@ class FormsTestCase(SimpleTestCase):
self.assertHTMLEqual(
str(p),
- """<tr><th><label for="id_first_name">First name:</label></th><td>
-<input type="text" name="first_name" id="id_first_name" required></td></tr>
-<tr><th><label for="id_last_name">Last name:</label></th><td>
-<input type="text" name="last_name" id="id_last_name" required></td></tr>
-<tr><th><label for="id_birthday">Birthday:</label></th><td>
-<input type="text" name="birthday" id="id_birthday" required></td></tr>""",
+ '<div><label for="id_first_name">First name:</label><input type="text" '
+ 'name="first_name" id="id_first_name" required></div><div><label '
+ 'for="id_last_name">Last name:</label><input type="text" name="last_name" '
+ 'id="id_last_name" required></div><div><label for="id_birthday">'
+ 'Birthday:</label><input type="text" name="birthday" id="id_birthday" '
+ "required></div>",
)
self.assertHTMLEqual(
p.as_table(),
@@ -4932,9 +4928,7 @@ class TemplateTests(SimpleTestCase):
t = Template(
'<form method="post">'
- "<table>"
"{{ form }}"
- "</table>"
'<input type="submit" required>'
"</form>"
)
@@ -4944,14 +4938,12 @@ class TemplateTests(SimpleTestCase):
self.assertHTMLEqual(
my_function("GET", {}),
'<form method="post">'
- "<table>"
- "<tr><th>Username:</th><td>"
- '<input type="text" name="username" maxlength="10" required></td></tr>'
- "<tr><th>Password1:</th><td>"
- '<input type="password" name="password1" required></td></tr>'
- "<tr><th>Password2:</th><td>"
- '<input type="password" name="password2" required></td></tr>'
- "</table>"
+ "<div>Username:"
+ '<input type="text" name="username" maxlength="10" required></div>'
+ "<div>Password1:"
+ '<input type="password" name="password1" required></div>'
+ "<div>Password2:"
+ '<input type="password" name="password2" required></div>'
'<input type="submit" required>'
"</form>",
)
@@ -4966,18 +4958,16 @@ class TemplateTests(SimpleTestCase):
},
),
'<form method="post">'
- "<table>"
- '<tr><td colspan="2"><ul class="errorlist nonfield">'
- "<li>Please make sure your passwords match.</li></ul></td></tr>"
- '<tr><th>Username:</th><td><ul class="errorlist">'
+ '<ul class="errorlist nonfield">'
+ "<li>Please make sure your passwords match.</li></ul>"
+ '<div>Username:<ul class="errorlist">'
"<li>Ensure this value has at most 10 characters (it has 23).</li></ul>"
'<input type="text" name="username" '
- 'value="this-is-a-long-username" maxlength="10" required></td></tr>'
- "<tr><th>Password1:</th><td>"
- '<input type="password" name="password1" required></td></tr>'
- "<tr><th>Password2:</th><td>"
- '<input type="password" name="password2" required></td></tr>'
- "</table>"
+ 'value="this-is-a-long-username" maxlength="10" required></div>'
+ "<div>Password1:"
+ '<input type="password" name="password1" required></div>'
+ "<div>Password2:"
+ '<input type="password" name="password2" required></div>'
'<input type="submit" required>'
"</form>",
)
@@ -5054,7 +5044,7 @@ class OverrideTests(SimpleTestCase):
f = FirstNameForm()
try:
- self.assertInHTML("<th>1</th>", f.render())
+ f.render()
except RecursionError:
self.fail("Cyclic reference in BoundField.render().")
@@ -5069,3 +5059,16 @@ class OverrideTests(SimpleTestCase):
'<label for="id_name" class="required">Name:</label>'
'<legend class="required">Language:</legend>',
)
+
+
+class DeprecationTests(SimpleTestCase):
+ def test_warning(self):
+ from django.forms.utils import DEFAULT_TEMPLATE_DEPRECATION_MSG
+
+ with isolate_lru_cache(get_default_renderer), self.settings(
+ FORM_RENDERER="django.forms.renderers.DjangoTemplates"
+ ), self.assertRaisesMessage(
+ RemovedInDjango50Warning, DEFAULT_TEMPLATE_DEPRECATION_MSG
+ ):
+ form = Person()
+ str(form)
diff --git a/tests/forms_tests/tests/test_formsets.py b/tests/forms_tests/tests/test_formsets.py
index 0868b41644..d159409afa 100644
--- a/tests/forms_tests/tests/test_formsets.py
+++ b/tests/forms_tests/tests/test_formsets.py
@@ -23,10 +23,12 @@ from django.forms.formsets import (
all_valid,
formset_factory,
)
-from django.forms.renderers import TemplatesSetting
+from django.forms.renderers import TemplatesSetting, get_default_renderer
from django.forms.utils import ErrorList
from django.forms.widgets import HiddenInput
from django.test import SimpleTestCase
+from django.test.utils import isolate_lru_cache
+from django.utils.deprecation import RemovedInDjango50Warning
from . import jinja2_tests
@@ -125,8 +127,8 @@ class FormsFormsetTestCase(SimpleTestCase):
<input type="hidden" name="choices-INITIAL_FORMS" value="0">
<input type="hidden" name="choices-MIN_NUM_FORMS" value="0">
<input type="hidden" name="choices-MAX_NUM_FORMS" value="1000">
-<tr><th>Choice:</th><td><input type="text" name="choices-0-choice"></td></tr>
-<tr><th>Votes:</th><td><input type="number" name="choices-0-votes"></td></tr>""",
+<div>Choice:<input type="text" name="choices-0-choice"></div>
+<div>Votes:<input type="number" name="choices-0-votes"></div>""",
)
# FormSet are treated similarly to Forms. FormSet has an is_valid()
# method, and a cleaned_data or errors attribute depending on whether
@@ -976,12 +978,12 @@ class FormsFormsetTestCase(SimpleTestCase):
formset = LimitedFavoriteDrinkFormSet()
self.assertHTMLEqual(
"\n".join(str(form) for form in formset.forms),
- """<tr><th><label for="id_form-0-name">Name:</label></th>
-<td><input type="text" name="form-0-name" id="id_form-0-name"></td></tr>
-<tr><th><label for="id_form-1-name">Name:</label></th>
-<td><input type="text" name="form-1-name" id="id_form-1-name"></td></tr>
-<tr><th><label for="id_form-2-name">Name:</label></th>
-<td><input type="text" name="form-2-name" id="id_form-2-name"></td></tr>""",
+ """<div><label for="id_form-0-name">Name:</label>
+ <input type="text" name="form-0-name" id="id_form-0-name"></div>
+<div><label for="id_form-1-name">Name:</label>
+<input type="text" name="form-1-name" id="id_form-1-name"></div>
+<div><label for="id_form-2-name">Name:</label>
+<input type="text" name="form-2-name" id="id_form-2-name"></div>""",
)
# If max_num is 0 then no form is rendered at all.
LimitedFavoriteDrinkFormSet = formset_factory(
@@ -997,10 +999,10 @@ class FormsFormsetTestCase(SimpleTestCase):
formset = LimitedFavoriteDrinkFormSet()
self.assertHTMLEqual(
"\n".join(str(form) for form in formset.forms),
- """<tr><th><label for="id_form-0-name">Name:</label></th><td>
-<input type="text" name="form-0-name" id="id_form-0-name"></td></tr>
-<tr><th><label for="id_form-1-name">Name:</label></th>
-<td><input type="text" name="form-1-name" id="id_form-1-name"></td></tr>""",
+ """<div><label for="id_form-0-name">Name:</label>
+<input type="text" name="form-0-name" id="id_form-0-name"></div>
+<div><label for="id_form-1-name">Name:</label>
+<input type="text" name="form-1-name" id="id_form-1-name"></div>""",
)
def test_limiting_extra_lest_than_max_num(self):
@@ -1011,8 +1013,8 @@ class FormsFormsetTestCase(SimpleTestCase):
formset = LimitedFavoriteDrinkFormSet()
self.assertHTMLEqual(
"\n".join(str(form) for form in formset.forms),
- """<tr><th><label for="id_form-0-name">Name:</label></th>
-<td><input type="text" name="form-0-name" id="id_form-0-name"></td></tr>""",
+ """<div><label for="id_form-0-name">Name:</label>
+<input type="text" name="form-0-name" id="id_form-0-name"></div>""",
)
def test_max_num_with_initial_data(self):
@@ -1024,11 +1026,11 @@ class FormsFormsetTestCase(SimpleTestCase):
self.assertHTMLEqual(
"\n".join(str(form) for form in formset.forms),
"""
- <tr><th><label for="id_form-0-name">Name:</label></th>
- <td><input type="text" name="form-0-name" value="Fernet and Coke"
- id="id_form-0-name"></td></tr>
- <tr><th><label for="id_form-1-name">Name:</label></th>
- <td><input type="text" name="form-1-name" id="id_form-1-name"></td></tr>
+ <div><label for="id_form-0-name">Name:</label>
+ <input type="text" name="form-0-name" value="Fernet and Coke"
+ id="id_form-0-name"></div>
+ <div><label for="id_form-1-name">Name:</label>
+ <input type="text" name="form-1-name" id="id_form-1-name"></div>
""",
)
@@ -1056,12 +1058,12 @@ class FormsFormsetTestCase(SimpleTestCase):
self.assertHTMLEqual(
"\n".join(str(form) for form in formset.forms),
"""
- <tr><th><label for="id_form-0-name">Name:</label></th>
- <td><input id="id_form-0-name" name="form-0-name" type="text"
- value="Fernet and Coke"></td></tr>
- <tr><th><label for="id_form-1-name">Name:</label></th>
- <td><input id="id_form-1-name" name="form-1-name" type="text"
- value="Bloody Mary"></td></tr>
+ <div><label for="id_form-0-name">Name:</label>
+ <input id="id_form-0-name" name="form-0-name" type="text"
+ value="Fernet and Coke"></div>
+ <div><label for="id_form-1-name">Name:</label>
+ <input id="id_form-1-name" name="form-1-name" type="text"
+ value="Bloody Mary"></div>
""",
)
@@ -1082,18 +1084,15 @@ class FormsFormsetTestCase(SimpleTestCase):
self.assertHTMLEqual(
"\n".join(str(form) for form in formset.forms),
"""
- <tr><th><label for="id_form-0-name">Name:</label></th>
- <td>
+ <div><label for="id_form-0-name">Name:</label>
<input id="id_form-0-name" name="form-0-name" type="text" value="Gin Tonic">
- </td></tr>
- <tr><th><label for="id_form-1-name">Name:</label></th>
- <td>
+ </div>
+ <div><label for="id_form-1-name">Name:</label>
<input id="id_form-1-name" name="form-1-name" type="text"
- value="Bloody Mary"></td></tr>
- <tr><th><label for="id_form-2-name">Name:</label></th>
- <td>
+ value="Bloody Mary"></div>
+ <div><label for="id_form-2-name">Name:</label>
<input id="id_form-2-name" name="form-2-name" type="text"
- value="Jack and Coke"></td></tr>
+ value="Jack and Coke"></div>
""",
)
@@ -1173,12 +1172,11 @@ class FormsFormsetTestCase(SimpleTestCase):
self.assertHTMLEqual(
"\n".join(str(form) for form in formset.forms),
"""
- <tr><th><label for="id_form-0-name">Name:</label></th>
- <td>
+ <div><label for="id_form-0-name">Name:</label>
<input type="text" name="form-0-name" value="Gin Tonic" id="id_form-0-name">
- </td></tr>
- <tr><th><label for="id_form-1-name">Name:</label></th>
- <td><input type="text" name="form-1-name" id="id_form-1-name"></td></tr>""",
+ </div>
+ <div><label for="id_form-1-name">Name:</label>
+ <input type="text" name="form-1-name" id="id_form-1-name"></div>""",
)
def test_management_form_field_names(self):
@@ -1701,16 +1699,16 @@ class TestIsBoundBehavior(SimpleTestCase):
# Can still render the formset.
self.assertHTMLEqual(
str(formset),
- '<tr><td colspan="2">'
'<ul class="errorlist nonfield">'
"<li>(Hidden field TOTAL_FORMS) This field is required.</li>"
"<li>(Hidden field INITIAL_FORMS) This field is required.</li>"
"</ul>"
+ "<div>"
'<input type="hidden" name="form-TOTAL_FORMS" id="id_form-TOTAL_FORMS">'
'<input type="hidden" name="form-INITIAL_FORMS" id="id_form-INITIAL_FORMS">'
'<input type="hidden" name="form-MIN_NUM_FORMS" id="id_form-MIN_NUM_FORMS">'
'<input type="hidden" name="form-MAX_NUM_FORMS" id="id_form-MAX_NUM_FORMS">'
- "</td></tr>\n",
+ "</div>\n",
)
def test_management_form_invalid_data(self):
@@ -1732,18 +1730,18 @@ class TestIsBoundBehavior(SimpleTestCase):
# Can still render the formset.
self.assertHTMLEqual(
str(formset),
- '<tr><td colspan="2">'
'<ul class="errorlist nonfield">'
"<li>(Hidden field TOTAL_FORMS) Enter a whole number.</li>"
"<li>(Hidden field INITIAL_FORMS) Enter a whole number.</li>"
"</ul>"
+ "<div>"
'<input type="hidden" name="form-TOTAL_FORMS" value="two" '
'id="id_form-TOTAL_FORMS">'
'<input type="hidden" name="form-INITIAL_FORMS" value="one" '
'id="id_form-INITIAL_FORMS">'
'<input type="hidden" name="form-MIN_NUM_FORMS" id="id_form-MIN_NUM_FORMS">'
'<input type="hidden" name="form-MAX_NUM_FORMS" id="id_form-MAX_NUM_FORMS">'
- "</td></tr>\n",
+ "</div>\n",
)
def test_customize_management_form_error(self):
@@ -1889,3 +1887,17 @@ class AllValidTests(SimpleTestCase):
]
self.assertEqual(formset1._errors, expected_errors)
self.assertEqual(formset2._errors, expected_errors)
+
+
+class DeprecationTests(SimpleTestCase):
+ def test_warning(self):
+ from django.forms.utils import DEFAULT_TEMPLATE_DEPRECATION_MSG
+
+ with isolate_lru_cache(get_default_renderer), self.settings(
+ FORM_RENDERER="django.forms.renderers.DjangoTemplates"
+ ), self.assertRaisesMessage(
+ RemovedInDjango50Warning, DEFAULT_TEMPLATE_DEPRECATION_MSG
+ ):
+ ChoiceFormSet = formset_factory(Choice)
+ formset = ChoiceFormSet()
+ str(formset)
generated by cgit v1.3 (git 2.53.0) at 2026-07-08 19:07:56 +0000