1 files changed, 92 insertions, 0 deletions
diff --git a/tests/template_tests/syntax_tests/test_comment.py b/tests/template_tests/syntax_tests/test_comment.py
new file mode 100644
index 0000000000..50d26e7cf1
--- /dev/null
+++ b/tests/template_tests/syntax_tests/test_comment.py
@@ -0,0 +1,92 @@
+from django.test import TestCase
+
+from .utils import render, setup
+
+
+class CommentSyntaxTests(TestCase):
+
+    @setup({'comment-syntax01': '{# this is hidden #}hello'})
+    def test_comment_syntax01(self):
+        output = render('comment-syntax01')
+        self.assertEqual(output, 'hello')
+
+    @setup({'comment-syntax02': '{# this is hidden #}hello{# foo #}'})
+    def test_comment_syntax02(self):
+        output = render('comment-syntax02')
+        self.assertEqual(output, 'hello')
+
+    @setup({'comment-syntax03': 'foo{#  {% if %}  #}'})
+    def test_comment_syntax03(self):
+        output = render('comment-syntax03')
+        self.assertEqual(output, 'foo')
+
+    @setup({'comment-syntax04': 'foo{#  {% endblock %}  #}'})
+    def test_comment_syntax04(self):
+        output = render('comment-syntax04')
+        self.assertEqual(output, 'foo')
+
+    @setup({'comment-syntax05': 'foo{#  {% somerandomtag %}  #}'})
+    def test_comment_syntax05(self):
+        output = render('comment-syntax05')
+        self.assertEqual(output, 'foo')
+
+    @setup({'comment-syntax06': 'foo{# {% #}'})
+    def test_comment_syntax06(self):
+        output = render('comment-syntax06')
+        self.assertEqual(output, 'foo')
+
+    @setup({'comment-syntax07': 'foo{# %} #}'})
+    def test_comment_syntax07(self):
+        output = render('comment-syntax07')
+        self.assertEqual(output, 'foo')
+
+    @setup({'comment-syntax08': 'foo{# %} #}bar'})
+    def test_comment_syntax08(self):
+        output = render('comment-syntax08')
+        self.assertEqual(output, 'foobar')
+
+    @setup({'comment-syntax09': 'foo{# {{ #}'})
+    def test_comment_syntax09(self):
+        output = render('comment-syntax09')
+        self.assertEqual(output, 'foo')
+
+    @setup({'comment-syntax10': 'foo{# }} #}'})
+    def test_comment_syntax10(self):
+        output = render('comment-syntax10')
+        self.assertEqual(output, 'foo')
+
+    @setup({'comment-syntax11': 'foo{# { #}'})
+    def test_comment_syntax11(self):
+        output = render('comment-syntax11')
+        self.assertEqual(output, 'foo')
+
+    @setup({'comment-syntax12': 'foo{# } #}'})
+    def test_comment_syntax12(self):
+        output = render('comment-syntax12')
+        self.assertEqual(output, 'foo')
+
+    @setup({'comment-tag01': '{% comment %}this is hidden{% endcomment %}hello'})
+    def test_comment_tag01(self):
+        output = render('comment-tag01')
+        self.assertEqual(output, 'hello')
+
+    @setup({'comment-tag02': '{% comment %}this is hidden{% endcomment %}'
+                             'hello{% comment %}foo{% endcomment %}'})
+    def test_comment_tag02(self):
+        output = render('comment-tag02')
+        self.assertEqual(output, 'hello')
+
+    @setup({'comment-tag03': 'foo{% comment %} {% if %} {% endcomment %}'})
+    def test_comment_tag03(self):
+        output = render('comment-tag03')
+        self.assertEqual(output, 'foo')
+
+    @setup({'comment-tag04': 'foo{% comment %} {% endblock %} {% endcomment %}'})
+    def test_comment_tag04(self):
+        output = render('comment-tag04')
+        self.assertEqual(output, 'foo')
+
+    @setup({'comment-tag05': 'foo{% comment %} {% somerandomtag %} {% endcomment %}'})
+    def test_comment_tag05(self):
+        output = render('comment-tag05')
+        self.assertEqual(output, 'foo')