summaryrefslogtreecommitdiff
path: root/tests/template_tests
diff options
context:
space:
mode:
authorMads Jensen <mje@inducks.org>2017-10-11 11:09:25 +0200
committerTim Graham <timograham@gmail.com>2017-10-20 09:46:31 -0400
commitf7036b3e26745b944cd888fe7ed3f677b2caec8f (patch)
tree410de1275df66ee9abbb8d8dc4ac4a112e3da7dc /tests/template_tests
parentd4fb742094dba99cb0db17f3aa9d9f5159af676f (diff)
Fixed #28662 -- Silenced join template filter error if arg isn't iterable.
Diffstat (limited to 'tests/template_tests')
-rw-r--r--tests/template_tests/filter_tests/test_join.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/template_tests/filter_tests/test_join.py b/tests/template_tests/filter_tests/test_join.py
index 2d2a9cf78e..43ac0da7c2 100644
--- a/tests/template_tests/filter_tests/test_join.py
+++ b/tests/template_tests/filter_tests/test_join.py
@@ -65,3 +65,11 @@ class FunctionTests(SimpleTestCase):
join(['<a>', '<img>', '</a>'], '<br>', autoescape=False),
'<a>&lt;br&gt;<img>&lt;br&gt;</a>',
)
+
+ def test_noniterable_arg(self):
+ obj = object()
+ self.assertEqual(join(obj, '<br>'), obj)
+
+ def test_noniterable_arg_autoescape_off(self):
+ obj = object()
+ self.assertEqual(join(obj, '<br>', autoescape=False), obj)