1 files changed, 61 insertions, 0 deletions
diff --git a/tests/template_tests/syntax_tests/test_now.py b/tests/template_tests/syntax_tests/test_now.py
new file mode 100644
index 0000000000..fecf30fc8c
--- /dev/null
+++ b/tests/template_tests/syntax_tests/test_now.py
@@ -0,0 +1,61 @@
+from datetime import datetime
+
+from django.test import TestCase
+from django.utils.formats import date_format
+
+from .utils import render, setup
+
+
+class NowTagTests(TestCase):
+
+    @setup({'now01': '{% now "j n Y" %}'})
+    def test_now01(self):
+        """
+        Simple case
+        """
+        output = render('now01')
+        self.assertEqual(output, "%d %d %d" % (
+            datetime.now().day, datetime.now().month, datetime.now().year,
+        ))
+
+    # Check parsing of locale strings
+    @setup({'now02': '{% now "DATE_FORMAT" %}'})
+    def test_now02(self):
+        output = render('now02')
+        self.assertEqual(output, date_format(datetime.now()))
+
+    @setup({'now03': '{% now \'j n Y\' %}'})
+    def test_now03(self):
+        """
+        #15092 - Also accept simple quotes
+        """
+        output = render('now03')
+        self.assertEqual(output, "%d %d %d" % (
+            datetime.now().day, datetime.now().month, datetime.now().year,
+        ))
+
+    @setup({'now04': '{% now \'DATE_FORMAT\' %}'})
+    def test_now04(self):
+        output = render('now04')
+        self.assertEqual(output, date_format(datetime.now()))
+
+    @setup({'now05': '{% now \'j "n" Y\'%}'})
+    def test_now05(self):
+        output = render('now05')
+        self.assertEqual(output, '%d "%d" %d' % (
+            datetime.now().day, datetime.now().month, datetime.now().year,
+        ))
+
+    @setup({'now06': '{% now "j \'n\' Y"%}'})
+    def test_now06(self):
+        output = render('now06')
+        self.assertEqual(output, "%d '%d' %d" % (
+            datetime.now().day, datetime.now().month, datetime.now().year,
+        ))
+
+    @setup({'now07': '{% now "j n Y" as N %}-{{N}}-'})
+    def test_now07(self):
+        output = render('now07')
+        self.assertEqual(output, '-%d %d %d-' % (
+            datetime.now().day, datetime.now().month, datetime.now().year,
+        ))