mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #24409 -- Combined the app_directories and filesystem loader implementation.

Browse Source 
Besides the directories they look in, these two loaders are functionally
the same. This removes unnecessary code duplication between the two.
This commit is contained in:
Preston Timmons
2015-02-24 09:17:17 -06:00
committed by Tim Graham
parent 4b8979e477
commit 80d6b6b863
3 changed files with 27 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/template_tests/test_loaders.py
View File

@@ -185,11 +185,16 @@ class FileSystemLoaderTests(SimpleTestCase):
def check_sources(path, expected_sources):
expected_sources = [os.path.abspath(s) for s in expected_sources]
self.assertEqual(
list(loader.get_template_sources(path, dirs)),
list(loader.get_template_sources(path)),
expected_sources,
)
yield check_sources
original_dirs = self.engine.dirs
self.engine.dirs = dirs
try:
yield check_sources
finally:
self.engine.dirs = original_dirs
def test_directory_security(self):
with self.source_checker(['/dir1', '/dir2']) as check_sources:
@@ -234,9 +239,18 @@ class FileSystemLoaderTests(SimpleTestCase):
check_sources('/DIR1/index.HTML', ['/DIR1/index.HTML'])
class AppDirectoriesLoaderTest(FileSystemLoaderTests):
class AppDirectoriesLoaderTest(SimpleTestCase):
def setUp(self):
self.engine = Engine(
loaders=['django.template.loaders.app_directories.Loader'],
)
@override_settings(INSTALLED_APPS=['template_tests'])
def test_load_template(self):
self.engine.get_template('index.html')
@override_settings(INSTALLED_APPS=[])
def test_not_installed(self):
with self.assertRaises(TemplateDoesNotExist):
self.engine.get_template('index.html')