summaryrefslogtreecommitdiff
path: root/tests/check_framework/test_templates.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/check_framework/test_templates.py')
-rw-r--r--tests/check_framework/test_templates.py29
1 files changed, 11 insertions, 18 deletions
diff --git a/tests/check_framework/test_templates.py b/tests/check_framework/test_templates.py
index 494dab0192..955c863822 100644
--- a/tests/check_framework/test_templates.py
+++ b/tests/check_framework/test_templates.py
@@ -1,6 +1,9 @@
from copy import copy, deepcopy
-from django.core.checks.templates import E001, E002
+from django.core.checks.templates import (
+ E001, E002, check_setting_app_dirs_loaders,
+ check_string_if_invalid_is_string,
+)
from django.test import SimpleTestCase
from django.test.utils import override_settings
@@ -16,29 +19,24 @@ class CheckTemplateSettingsAppDirsTest(SimpleTestCase):
},
]
- @property
- def func(self):
- from django.core.checks.templates import check_setting_app_dirs_loaders
- return check_setting_app_dirs_loaders
-
@override_settings(TEMPLATES=TEMPLATES_APP_DIRS_AND_LOADERS)
def test_app_dirs_and_loaders(self):
"""
Error if template loaders are specified and APP_DIRS is True.
"""
- self.assertEqual(self.func(None), [E001])
+ self.assertEqual(check_setting_app_dirs_loaders(None), [E001])
def test_app_dirs_removed(self):
TEMPLATES = deepcopy(self.TEMPLATES_APP_DIRS_AND_LOADERS)
del TEMPLATES[0]['APP_DIRS']
with self.settings(TEMPLATES=TEMPLATES):
- self.assertEqual(self.func(None), [])
+ self.assertEqual(check_setting_app_dirs_loaders(None), [])
def test_loaders_removed(self):
TEMPLATES = deepcopy(self.TEMPLATES_APP_DIRS_AND_LOADERS)
del TEMPLATES[0]['OPTIONS']['loaders']
with self.settings(TEMPLATES=TEMPLATES):
- self.assertEqual(self.func(None), [])
+ self.assertEqual(check_setting_app_dirs_loaders(None), [])
class CheckTemplateStringIfInvalidTest(SimpleTestCase):
@@ -67,30 +65,25 @@ class CheckTemplateStringIfInvalidTest(SimpleTestCase):
cls.error1.msg = cls.error1.msg.format(string_if_invalid1, type(string_if_invalid1).__name__)
cls.error2.msg = cls.error2.msg.format(string_if_invalid2, type(string_if_invalid2).__name__)
- @property
- def func(self):
- from django.core.checks.templates import check_string_if_invalid_is_string
- return check_string_if_invalid_is_string
-
@override_settings(TEMPLATES=TEMPLATES_STRING_IF_INVALID)
def test_string_if_invalid_not_string(self):
- self.assertEqual(self.func(None), [self.error1, self.error2])
+ self.assertEqual(check_string_if_invalid_is_string(None), [self.error1, self.error2])
def test_string_if_invalid_first_is_string(self):
TEMPLATES = deepcopy(self.TEMPLATES_STRING_IF_INVALID)
TEMPLATES[0]['OPTIONS']['string_if_invalid'] = 'test'
with self.settings(TEMPLATES=TEMPLATES):
- self.assertEqual(self.func(None), [self.error2])
+ self.assertEqual(check_string_if_invalid_is_string(None), [self.error2])
def test_string_if_invalid_both_are_strings(self):
TEMPLATES = deepcopy(self.TEMPLATES_STRING_IF_INVALID)
TEMPLATES[0]['OPTIONS']['string_if_invalid'] = 'test'
TEMPLATES[1]['OPTIONS']['string_if_invalid'] = 'test'
with self.settings(TEMPLATES=TEMPLATES):
- self.assertEqual(self.func(None), [])
+ self.assertEqual(check_string_if_invalid_is_string(None), [])
def test_string_if_invalid_not_specified(self):
TEMPLATES = deepcopy(self.TEMPLATES_STRING_IF_INVALID)
del TEMPLATES[1]['OPTIONS']['string_if_invalid']
with self.settings(TEMPLATES=TEMPLATES):
- self.assertEqual(self.func(None), [self.error1])
+ self.assertEqual(check_string_if_invalid_is_string(None), [self.error1])