From 6537501b612fe8ad5c8be277dbd9a3611277ad2a Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Fri, 25 Mar 2022 06:30:25 +0100 Subject: [PATCH] Fixed forms_tests.tests.test_renderers with Jinja 3.1.0+. See https://github.com/pallets/jinja/pull/1621. --- tests/forms_tests/tests/test_renderers.py | 24 +++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/forms_tests/tests/test_renderers.py b/tests/forms_tests/tests/test_renderers.py index 3e973ad8fc0e..27429ac74900 100644 --- a/tests/forms_tests/tests/test_renderers.py +++ b/tests/forms_tests/tests/test_renderers.py @@ -1,4 +1,5 @@ import os +import posixpath import unittest from django.forms.renderers import ( @@ -8,6 +9,7 @@ TemplatesSetting, ) from django.test import SimpleTestCase +from django.utils.version import get_version_tuple try: import jinja2 @@ -50,6 +52,28 @@ class Jinja2Tests(SharedTests, SimpleTestCase): renderer = Jinja2 expected_widget_dir = "jinja2" + @property + def jinja2_version(self): + return get_version_tuple(jinja2.__version__) + + def test_installed_apps_template_found(self): + """Can find a custom template in INSTALLED_APPS.""" + renderer = self.renderer() + # Found because forms_tests is . + tpl = renderer.get_template("forms_tests/custom_widget.html") + expected_path = os.path.abspath( + os.path.join(os.path.dirname(__file__), "..", self.expected_widget_dir) + ) + if self.jinja2_version < (3, 1): + expected_path = os.path.join( + expected_path, "forms_tests", "custom_widget.html" + ) + else: + expected_path = posixpath.join( + expected_path, "forms_tests", "custom_widget.html" + ) + self.assertEqual(tpl.origin.name, expected_path) + class TemplatesSettingTests(SharedTests, SimpleTestCase): renderer = TemplatesSetting