Ticket #6888: month_tests.diff

tests/regressiontests/views/tests/generic/date_based.py

@@ -1 +1 @@
 # coding: utf-8 
 from django.test import TestCase 
-from datetime import datetime 
+from datetime import datetime, date
 from datetime import timedelta 
-from regressiontests.views.models import Article, Author
+from regressiontests.views.models import Article, Author, Issue
 
 class ObjectDetailTest(TestCase):
     fixtures = ['testdata.json'] 
@@ -67 +67 @@
         article.save() 
         response = self.client.get('/views/date_based/archive_month/2004/02/') 
         self.assertEqual(response.status_code, 404) 
-                 
-         
- No newline at end of file
+
+    def test_archive_month_midnight(self):
+        "Archive for month should not include item at start of next month"
+        february_issues = [
+            Issue.objects.create(pub_date=date(2008, 2, 1)),
+            Issue.objects.create(pub_date=date(2008, 2, 10)),
+            Issue.objects.create(pub_date=date(2008, 2, 20)),
+            Issue.objects.create(pub_date=date(2008, 2, 29)),
+        ]
+        march_issues = [
+            Issue.objects.create(pub_date=date(2008, 3, 1)),
+            Issue.objects.create(pub_date=datetime(2008, 3, 1, 0, 0, 0)),
+            Issue.objects.create(pub_date=date(2008, 3, 10)),
+        ]
+
+        self.assertEqual(Issue.objects.filter(pub_date__month=2).count(), len(february_issues))
+        
+        response = self.client.get('/views/date_based/issues/archive_month/2008/02/') 
+        self.assertEqual(response.status_code, 200)
+        
+        object_list = response.context['object_list']
+        
+        self.assertEqual(len(object_list), len(february_issues))
+        for issue in object_list:
+            self.assertEqual(issue.pub_date.month, 2)

tests/regressiontests/views/models.py

@@ -24 +24 @@
     def __unicode__(self):
         return self.title
 
+
+class Issue(models.Model):
+    pub_date = models.DateTimeField()
+    
+    def __unicode__(self):
+        return self.pub_date.strftime('%Y-%m-%d')

tests/regressiontests/views/urls.py

@@ -14 +14 @@
     'packages': ('regressiontests.views',),
 }
 
-date_based_info_dict = { 
+article_date_based_info_dict = { 
     'queryset': Article.objects.all(), 
     'date_field': 'date_created', 
     'month_format': '%m', 
 } 
 
+issue_date_based_info_dict = { 
+    'queryset': Issue.objects.all(), 
+    'date_field': 'pub_date', 
+    'month_format': '%m', 
+} 
+
 urlpatterns = patterns('',
     (r'^$', views.index_page),
     
@@ -38 +44 @@
         # Date-based generic views
     (r'^date_based/object_detail/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<slug>[-\w]+)/$', 
         'django.views.generic.date_based.object_detail', 
-        dict(slug_field='slug', **date_based_info_dict)), 
+        dict(slug_field='slug', **article_date_based_info_dict)), 
     (r'^date_based/object_detail/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<slug>[-\w]+)/allow_future/$', 
         'django.views.generic.date_based.object_detail', 
-        dict(allow_future=True, slug_field='slug', **date_based_info_dict)), 
+        dict(allow_future=True, slug_field='slug', **article_date_based_info_dict)), 
     (r'^date_based/archive_month/(?P<year>\d{4})/(?P<month>\d{1,2})/$', 
         'django.views.generic.date_based.archive_month', 
-        date_based_info_dict),     
+        article_date_based_info_dict),     
+
+    (r'^date_based/issues/archive_month/(?P<year>\d{4})/(?P<month>\d{1,2})/$', 
+        'django.views.generic.date_based.archive_month', 
+        issue_date_based_info_dict),
 )