summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-02-11 06:51:57 -0500
committerTim Graham <timograham@gmail.com>2017-02-11 06:52:14 -0500
commit9658f0d266bfded9ead5ead7a80823b4739c149f (patch)
tree2e8610084c008c7a7994c516ab5d8d83ad79da6d /tests
parenteeb28f47512c5ff969d014ba35b9e955de1583ce (diff)
[1.11.x] Fixed #27722 -- Reallowed using django.Template in {% include %}.
Backport of fe2d2884345e1e6a1daadd76e9404c62791ab589 from master
Diffstat (limited to 'tests')
-rw-r--r--tests/template_tests/syntax_tests/test_include.py7
-rw-r--r--tests/template_tests/templates/include_tpl.html1
2 files changed, 7 insertions, 1 deletions
diff --git a/tests/template_tests/syntax_tests/test_include.py b/tests/template_tests/syntax_tests/test_include.py
index ca7ee6f5b0..185bcb3988 100644
--- a/tests/template_tests/syntax_tests/test_include.py
+++ b/tests/template_tests/syntax_tests/test_include.py
@@ -1,7 +1,7 @@
import warnings
from django.template import (
- Context, Engine, TemplateDoesNotExist, TemplateSyntaxError,
+ Context, Engine, TemplateDoesNotExist, TemplateSyntaxError, loader,
)
from django.test import SimpleTestCase, ignore_warnings
from django.utils.deprecation import RemovedInDjango21Warning
@@ -280,6 +280,11 @@ class IncludeTests(SimpleTestCase):
output = outer_tmpl.render(ctx)
self.assertEqual(output, 'This worked!')
+ def test_include_from_loader_get_template(self):
+ tmpl = loader.get_template('include_tpl.html') # {% include tmpl %}
+ output = tmpl.render({'tmpl': loader.get_template('index.html')})
+ self.assertEqual(output, 'index\n\n')
+
def test_include_immediate_missing(self):
"""
#16417 -- Include tags pointing to missing templates should not raise
diff --git a/tests/template_tests/templates/include_tpl.html b/tests/template_tests/templates/include_tpl.html
new file mode 100644
index 0000000000..7a8374df51
--- /dev/null
+++ b/tests/template_tests/templates/include_tpl.html
@@ -0,0 +1 @@
+{% include tmpl %}