diff options
| author | Tim Graham <timograham@gmail.com> | 2017-03-25 08:22:12 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-03-25 08:22:31 -0400 |
| commit | 8cc2f5aed186f8b83bfac240b2a1480bd0c11e4f (patch) | |
| tree | 60471d6782f8aed2142199dfd2bcf34252866bbc /tests | |
| parent | b6a6787fd857813801dbcd63ac6672da355af998 (diff) | |
[1.11.x] Fixed #27956 -- Fixed display of errors in an {% extends %} child.
Thanks Ling-Xiao Yang for the report and test, and
Preston Timmons for the fix.
Backport of e643ba8bcf0b1da517cbab689ac157ee031202a3 from master
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/template_tests/templates/27956_child.html | 3 | ||||
| -rw-r--r-- | tests/template_tests/templates/27956_parent.html | 5 | ||||
| -rw-r--r-- | tests/template_tests/tests.py | 12 |
3 files changed, 20 insertions, 0 deletions
diff --git a/tests/template_tests/templates/27956_child.html b/tests/template_tests/templates/27956_child.html new file mode 100644 index 0000000000..ea9aeb2197 --- /dev/null +++ b/tests/template_tests/templates/27956_child.html @@ -0,0 +1,3 @@ +{% extends "27956_parent.html" %} + +{% block content %}{% endblock %} diff --git a/tests/template_tests/templates/27956_parent.html b/tests/template_tests/templates/27956_parent.html new file mode 100644 index 0000000000..dad4fbbfe5 --- /dev/null +++ b/tests/template_tests/templates/27956_parent.html @@ -0,0 +1,5 @@ +{% load tag_27584 %} + +{% badtag %}{% endbadtag %} + +{% block content %}{% endblock %} diff --git a/tests/template_tests/tests.py b/tests/template_tests/tests.py index 50ddee6674..4ec724db99 100644 --- a/tests/template_tests/tests.py +++ b/tests/template_tests/tests.py @@ -125,6 +125,18 @@ class TemplateTests(SimpleTestCase): t.render(Context()) self.assertEqual(e.exception.template_debug['during'], '{% badtag %}') + def test_compile_tag_error_27956(self): + """Errors in a child of {% extends %} are displayed correctly.""" + engine = Engine( + app_dirs=True, + debug=True, + libraries={'tag_27584': 'template_tests.templatetags.tag_27584'}, + ) + t = engine.get_template('27956_child.html') + with self.assertRaises(TemplateSyntaxError) as e: + t.render(Context()) + self.assertEqual(e.exception.template_debug['during'], '{% badtag %}') + def test_super_errors(self): """ #18169 -- NoReverseMatch should not be silence in block.super. |
