From 4cc0baa98e8a5bb8f2cf91539d141cbc30af6f61 Mon Sep 17 00:00:00 2001 From: Daniel Roseman Date: Sat, 11 Jul 2015 18:15:38 +0100 Subject: [1.8.x] Fixed #25079 -- Added warning if both TEMPLATES and TEMPLATE_* settings are defined. Django ignores the value of the TEMPLATE_* settings if TEMPLATES is also set, which is confusing for users following older tutorials. This change adds a system check that warns if any of the TEMPLATE_* settings have changed from their defaults but the TEMPLATES dict is also non-empty. Removed the TEMPLATE_DIRS from the test settings file; this was marked for removal in 1.10 but no tests fail if it is removed now. Backport of 24620d71f2116da31abe6c9391f7bc807ac23c0b from master --- tests/check_framework/tests_1_8_compatibility.py | 29 ++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 tests/check_framework/tests_1_8_compatibility.py (limited to 'tests/check_framework') diff --git a/tests/check_framework/tests_1_8_compatibility.py b/tests/check_framework/tests_1_8_compatibility.py new file mode 100644 index 0000000000..8f354b6b3a --- /dev/null +++ b/tests/check_framework/tests_1_8_compatibility.py @@ -0,0 +1,29 @@ +from django.core.checks.compatibility.django_1_8_0 import \ + check_duplicate_template_settings +from django.test import SimpleTestCase +from django.test.utils import override_settings + + +class CheckDuplicateTemplateSettingsTest(SimpleTestCase): + + def test_not_raised_if_no_templates_setting(self): + self.assertEqual(check_duplicate_template_settings(None), []) + + @override_settings( + TEMPLATES=[{'BACKEND': 'django.template.backends.django.DjangoTemplates'}], + TEMPLATE_DIRS=['/path/to/dirs'], + ) + def test_duplicate_setting(self): + result = check_duplicate_template_settings(None) + self.assertEqual(result[0].id, '1_8.W001') + + @override_settings( + TEMPLATES=[{'BACKEND': 'django.template.backends.django.DjangoTemplates'}], + TEMPLATE_DIRS=['/path/to/dirs'], + TEMPLATE_DEBUG=True, + ) + def test_multiple_duplicate_settings(self): + result = check_duplicate_template_settings(None) + self.assertEqual(len(result), 1) + self.assertTrue('TEMPLATE_DIRS' in result[0].msg) + self.assertTrue('TEMPLATE_DEBUG' in result[0].msg) -- cgit v1.3