Ticket #15012: t15012.diff

tests/regressiontests/generic_views/base.py

@@ +1 @@
+import time
 import unittest
 
 from django.core.exceptions import ImproperlyConfigured
@@ -158 +159 @@
     def _assert_about(self, response):
         response.render()
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.content, '<h1>About</h1>')
+        self.assertContains(response, '<h1>About</h1>')
 
     def test_get(self):
         """
@@ -197 +198 @@
         self.assertEqual(response.context['params'], {'foo': 'bar'})
         self.assertEqual(response.context['key'], 'value')
 
+    def test_cached_views(self):
+        """
+        A template view can be cached
+        """
+        response = self.client.get('/template/cached/bar/')
+        self.assertEqual(response.status_code, 200)
+
+        time.sleep(0.2)
+
+        response2 = self.client.get('/template/cached/bar/')
+        self.assertEqual(response2.status_code, 200)
+
+        self.assertEqual(response.content, response2.content)
+
+        time.sleep(1.0)
+
+        # Let the cache expire and test again
+        response2 = self.client.get('/template/cached/bar/')
+        self.assertEqual(response2.status_code, 200)
+
+        self.assertNotEqual(response.content, response2.content)
+
 class RedirectViewTest(unittest.TestCase):
     rf = RequestFactory()
 

tests/regressiontests/generic_views/templates/generic_views/about.html

@@ -1 @@
-<h1>About</h1>
- No newline at end of file
+<h1>About</h1>
+{% now "U.u" %}

tests/regressiontests/generic_views/urls.py

@@ -1 +1 @@
 from django.conf.urls.defaults import *
 from django.views.generic import TemplateView
+from django.views.decorators.cache import cache_page
 
 import views
 
@@ -15 +16 @@
     (r'^template/custom/(?P<foo>\w+)/$',
         views.CustomTemplateView.as_view(template_name='generic_views/about.html')),
 
+    (r'^template/cached/(?P<foo>\w+)/$',
+        cache_page(TemplateView.as_view(template_name='generic_views/about.html'), 1)),
+
     # DetailView
     (r'^detail/obj/$',
         views.ObjectDetail.as_view()),