From f7036b3e26745b944cd888fe7ed3f677b2caec8f Mon Sep 17 00:00:00 2001
From: Mads Jensen <mje@inducks.org>
Date: Wed, 11 Oct 2017 11:09:25 +0200
Subject: Fixed #28662 -- Silenced join template filter error if arg isn't
 iterable.

---
 tests/template_tests/filter_tests/test_join.py | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'tests/template_tests')

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)
-- 
cgit v1.3