From d126eba3637d84caa80fa4258e2e59ef07a8260c Mon Sep 17 00:00:00 2001 From: David Smith Date: Thu, 5 May 2022 14:26:09 +0200 Subject: Refs #32339 -- Deprecated default.html form template. Co-authored-by: Carlton Gibson --- tests/forms_tests/tests/__init__.py | 4 +- tests/forms_tests/tests/test_forms.py | 99 +++++++++++++------------- tests/forms_tests/tests/test_formsets.py | 100 ++++++++++++++------------ tests/model_forms/tests.py | 117 ++++++++++++++++--------------- tests/postgres_tests/test_array.py | 14 ++-- tests/postgres_tests/test_ranges.py | 22 +++--- tests/runtests.py | 3 + 7 files changed, 188 insertions(+), 171 deletions(-) (limited to 'tests') 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), - """ - - - - - - - """, + '
' + '
' + '
', ) self.assertHTMLEqual( p.as_div(), @@ -182,15 +178,15 @@ class FormsTestCase(SimpleTestCase): self.assertEqual(p.cleaned_data, {}) self.assertHTMLEqual( str(p), - """ - - - - - - - -""", + '
' + '
  • This field is required.
' + '
' + '
' + '
  • This field is required.
' + '
' + '' + '
  • This field is required.
' + '
', ) self.assertHTMLEqual( p.as_table(), @@ -261,12 +257,12 @@ class FormsTestCase(SimpleTestCase): self.assertHTMLEqual( str(p), - """ - - - - -""", + '
", ) self.assertHTMLEqual( p.as_table(), @@ -4932,9 +4928,7 @@ class TemplateTests(SimpleTestCase): t = Template( '
' - "" "{{ form }}" - "
" '' "
" ) @@ -4944,14 +4938,12 @@ class TemplateTests(SimpleTestCase): self.assertHTMLEqual( my_function("GET", {}), '
' - "" - "' - "' - "' - "
Username:" - '
Password1:" - '
Password2:" - '
" + "
Username:" + '
' + "
Password1:" + '
' + "
Password2:" + '
' '' "
", ) @@ -4966,18 +4958,16 @@ class TemplateTests(SimpleTestCase): }, ), '
' - "" - '" - '' - "' - "' - "
    ' - "
  • Please make sure your passwords match.
Username:
    ' + '
      ' + "
    • Please make sure your passwords match.
    " + '
    Username:
      ' "
    • Ensure this value has at most 10 characters (it has 23).
    " '
Password1:" - '
Password2:" - '
" + 'value="this-is-a-long-username" maxlength="10" required>' + "
Password1:" + '
' + "
Password2:" + '
' '' "
", ) @@ -5054,7 +5044,7 @@ class OverrideTests(SimpleTestCase): f = FirstNameForm() try: - self.assertInHTML("1", f.render()) + f.render() except RecursionError: self.fail("Cyclic reference in BoundField.render().") @@ -5069,3 +5059,16 @@ class OverrideTests(SimpleTestCase): '' 'Language:', ) + + +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): -Choice: -Votes:""", +
Choice:
+
Votes:
""", ) # 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), - """ - - - - -""", + """
+
+
+
+
+
""", ) # 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), - """ - - -""", + """
+
+
+
""", ) 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), - """ -""", + """
+
""", ) 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), """ - - - - +
+
+
+
""", ) @@ -1056,12 +1058,12 @@ class FormsFormsetTestCase(SimpleTestCase): self.assertHTMLEqual( "\n".join(str(form) for form in formset.forms), """ - - - - +
+
+
+
""", ) @@ -1082,18 +1084,15 @@ class FormsFormsetTestCase(SimpleTestCase): self.assertHTMLEqual( "\n".join(str(form) for form in formset.forms), """ - - +
- - - +
+
- - + value="Bloody Mary">
+
+ value="Jack and Coke">
""", ) @@ -1173,12 +1172,11 @@ class FormsFormsetTestCase(SimpleTestCase): self.assertHTMLEqual( "\n".join(str(form) for form in formset.forms), """ - - +
- - - """, +
+
+
""", ) def test_management_form_field_names(self): @@ -1701,16 +1699,16 @@ class TestIsBoundBehavior(SimpleTestCase): # Can still render the formset. self.assertHTMLEqual( str(formset), - '' '" + "
" '' '' '' '' - "\n", + "
\n", ) def test_management_form_invalid_data(self): @@ -1732,18 +1730,18 @@ class TestIsBoundBehavior(SimpleTestCase): # Can still render the formset. self.assertHTMLEqual( str(formset), - '' '" + "
" '' '' '' '' - "\n", + "
\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) diff --git a/tests/model_forms/tests.py b/tests/model_forms/tests.py index a8617444c5..eb9c2484dc 100644 --- a/tests/model_forms/tests.py +++ b/tests/model_forms/tests.py @@ -687,12 +687,12 @@ class ModelFormBaseTest(TestCase): self.assertHTMLEqual( str(SubclassMeta()), - """ - - - - -""", + '
' + '' + '
' + '' + '
', ) def test_orderfields_form(self): @@ -704,10 +704,10 @@ class ModelFormBaseTest(TestCase): self.assertEqual(list(OrderFields.base_fields), ["url", "name"]) self.assertHTMLEqual( str(OrderFields()), - """ - - -""", + '
' + '' + '
', ) def test_orderfields2_form(self): @@ -1460,12 +1460,11 @@ class ModelFormBasicTests(TestCase): f = BaseCategoryForm() self.assertHTMLEqual( str(f), - """ - - - - -""", + '
' + '
', ) self.assertHTMLEqual( str(f.as_ul()), @@ -1538,12 +1537,9 @@ class ModelFormBasicTests(TestCase): f = RoykoForm(auto_id=False, instance=self.w_royko) self.assertHTMLEqual( str(f), - """ - Name: - -
- Use both first and last names. - """, + '
Name:
Use both first and last names.
' + '
", ) art = Article.objects.create( @@ -1703,30 +1699,39 @@ class ModelFormBasicTests(TestCase): self.assertHTMLEqual( str(f), """ - Headline: - - Slug: - - Pub date: - - Writer: - Article: - - Categories: - Status: +
Headline: + +
+
Slug: + +
+
Pub date: + +
+
Writer: + +
+
Article: + +
+
Categories: + +
+
Status: + +
""" % (self.w_woodward.pk, self.w_royko.pk, self.c1.pk, self.c2.pk, self.c3.pk), ) @@ -1791,12 +1796,8 @@ class ModelFormBasicTests(TestCase): f = PartialArticleForm(auto_id=False) self.assertHTMLEqual( str(f), - """ - Headline: - - Pub date: - - """, + '
Headline:' + '
Pub date:
', ) class PartialArticleFormWithSlug(forms.ModelForm): @@ -2990,10 +2991,10 @@ class OtherModelFormTests(TestCase): self.assertHTMLEqual( str(CategoryForm()), - """ - - -""", + '
' + '
', ) # to_field_name should also work on ModelMultipleChoiceField ################## @@ -3014,8 +3015,8 @@ class OtherModelFormTests(TestCase): self.assertEqual(list(CustomFieldForExclusionForm.base_fields), ["name"]) self.assertHTMLEqual( str(CustomFieldForExclusionForm()), - """ -""", + '
', ) def test_iterable_model_m2m(self): diff --git a/tests/postgres_tests/test_array.py b/tests/postgres_tests/test_array.py index 7243ab6a5a..1100e8f3b0 100644 --- a/tests/postgres_tests/test_array.py +++ b/tests/postgres_tests/test_array.py @@ -1196,14 +1196,12 @@ class TestSplitFormField(PostgreSQLSimpleTestCase): self.assertHTMLEqual( str(SplitForm()), """ - - - - - - - - +
+ + + + +
""", ) diff --git a/tests/postgres_tests/test_ranges.py b/tests/postgres_tests/test_ranges.py index 1b155ed51a..7f8fc6bb8c 100644 --- a/tests/postgres_tests/test_ranges.py +++ b/tests/postgres_tests/test_ranges.py @@ -687,17 +687,15 @@ class TestFormField(PostgreSQLSimpleTestCase): self.assertHTMLEqual( str(form), """ - - - - - +
+
+ Field: - - +
+
""", ) form = SplitForm( @@ -788,13 +786,13 @@ class TestFormField(PostgreSQLSimpleTestCase): self.assertHTMLEqual( str(RangeForm()), """ - - - +
+
+ Ints: - - +
+
""", ) diff --git a/tests/runtests.py b/tests/runtests.py index e3a60d777b..e5adb902c3 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -243,6 +243,9 @@ def setup_collect_tests(start_at, start_after, test_labels=None): "fields.W342", # ForeignKey(unique=True) -> OneToOneField ] + # RemovedInDjango50Warning + settings.FORM_RENDERER = "django.forms.renderers.DjangoDivFormRenderer" + # Load all the ALWAYS_INSTALLED_APPS. django.setup() -- cgit v1.3