Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Fixed #7602 -- Corrected lookup keyword arguments in archive_month an…
…d archive_week to properly range when date_field is from DateField. Thanks nullie for the original patch and Colin Grady for the test coverage. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8476 bcc190cf-cafb-0310-a4f2-bffc1f526a37
- Loading branch information
Showing
5 changed files
with
101 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
135 changes: 78 additions & 57 deletions
135
tests/regressiontests/views/tests/generic/date_based.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -1,71 +1,92 @@ | |||
# coding: utf-8 | # coding: utf-8 | ||
from django.test import TestCase | from django.test import TestCase | ||
from datetime import datetime | from datetime import datetime | ||
from datetime import timedelta | from datetime import timedelta | ||
from regressiontests.views.models import Article, Author | from regressiontests.views.models import Article, Author, DateArticle | ||
|
|
||
class ObjectDetailTest(TestCase): | class ObjectDetailTest(TestCase): | ||
fixtures = ['testdata.json'] | fixtures = ['testdata.json'] | ||
def setUp(self): | def setUp(self): | ||
# Correct the date for the current article | # Correct the date for the current article | ||
current_article = Article.objects.get(title="Current Article") | current_article = Article.objects.get(title="Current Article") | ||
current_article.date_created = datetime.now() | current_article.date_created = datetime.now() | ||
current_article.save() | current_article.save() | ||
|
|||
def test_finds_past(self): | def test_finds_past(self): | ||
"date_based.object_detail can view a page in the past" | "date_based.object_detail can view a page in the past" | ||
response = self.client.get('/views/date_based/object_detail/2001/01/01/old_article/') | response = self.client.get('/views/date_based/object_detail/2001/01/01/old_article/') | ||
self.assertEqual(response.status_code, 200) | self.assertEqual(response.status_code, 200) | ||
self.assertEqual(response.context['object'].title, "Old Article") | self.assertEqual(response.context['object'].title, "Old Article") | ||
|
|||
def test_object_detail_finds_today(self): | def test_object_detail_finds_today(self): | ||
"date_based.object_detail can view a page from today" | "date_based.object_detail can view a page from today" | ||
today_url = datetime.now().strftime('%Y/%m/%d') | today_url = datetime.now().strftime('%Y/%m/%d') | ||
response = self.client.get('/views/date_based/object_detail/%s/current_article/' % today_url) | response = self.client.get('/views/date_based/object_detail/%s/current_article/' % today_url) | ||
self.assertEqual(response.status_code, 200) | self.assertEqual(response.status_code, 200) | ||
self.assertEqual(response.context['object'].title, "Current Article") | self.assertEqual(response.context['object'].title, "Current Article") | ||
|
|||
def test_object_detail_ignores_future(self): | def test_object_detail_ignores_future(self): | ||
"date_based.object_detail can view a page from the future, but only if allowed." | "date_based.object_detail can view a page from the future, but only if allowed." | ||
response = self.client.get('/views/date_based/object_detail/3000/01/01/future_article/') | response = self.client.get('/views/date_based/object_detail/3000/01/01/future_article/') | ||
self.assertEqual(response.status_code, 404) | self.assertEqual(response.status_code, 404) | ||
|
|
||
def test_object_detail_allowed_future_if_enabled(self): | def test_object_detail_allowed_future_if_enabled(self): | ||
"date_based.object_detail can view a page from the future if explicitly allowed." | "date_based.object_detail can view a page from the future if explicitly allowed." | ||
response = self.client.get('/views/date_based/object_detail/3000/01/01/future_article/allow_future/') | response = self.client.get('/views/date_based/object_detail/3000/01/01/future_article/allow_future/') | ||
self.assertEqual(response.status_code, 200) | self.assertEqual(response.status_code, 200) | ||
self.assertEqual(response.context['object'].title, "Future Article") | self.assertEqual(response.context['object'].title, "Future Article") | ||
|
|||
class MonthArchiveTest(TestCase): | class MonthArchiveTest(TestCase): | ||
def test_archive_month_includes_only_month(self): | def test_archive_month_includes_only_month(self): | ||
"Regression for #3031: Archives around Feburary include only one month" | "Regression for #3031: Archives around Feburary include only one month" | ||
author = Author(name="John Smith") | author = Author(name="John Smith") | ||
author.save() | author.save() | ||
|
|
||
# 2004 was a leap year, so it should be weird enough to not cheat | # 2004 was a leap year, so it should be weird enough to not cheat | ||
first_second_of_feb = datetime(2004, 2, 1, 0, 0, 1) | first_second_of_feb = datetime(2004, 2, 1, 0, 0, 1) | ||
first_second_of_mar = datetime(2004, 3, 1, 0, 0, 1) | first_second_of_mar = datetime(2004, 3, 1, 0, 0, 1) | ||
two_seconds = timedelta(0, 2, 0) | two_seconds = timedelta(0, 2, 0) | ||
article = Article(title="example", author=author) | article = Article(title="example", author=author) | ||
|
|
||
article.date_created = first_second_of_feb | article.date_created = first_second_of_feb | ||
article.save() | article.save() | ||
response = self.client.get('/views/date_based/archive_month/2004/02/') | response = self.client.get('/views/date_based/archive_month/2004/02/') | ||
self.assertEqual(response.status_code, 200) | self.assertEqual(response.status_code, 200) | ||
|
|
||
article.date_created = first_second_of_feb-two_seconds | article.date_created = first_second_of_feb-two_seconds | ||
article.save() | article.save() | ||
response = self.client.get('/views/date_based/archive_month/2004/02/') | response = self.client.get('/views/date_based/archive_month/2004/02/') | ||
self.assertEqual(response.status_code, 404) | self.assertEqual(response.status_code, 404) | ||
|
|
||
article.date_created = first_second_of_mar-two_seconds | article.date_created = first_second_of_mar-two_seconds | ||
article.save() | article.save() | ||
response = self.client.get('/views/date_based/archive_month/2004/02/') | response = self.client.get('/views/date_based/archive_month/2004/02/') | ||
self.assertEqual(response.status_code, 200) | self.assertEqual(response.status_code, 200) | ||
|
|
||
article.date_created = first_second_of_mar | article.date_created = first_second_of_mar | ||
article.save() | article.save() | ||
response = self.client.get('/views/date_based/archive_month/2004/02/') | response = self.client.get('/views/date_based/archive_month/2004/02/') | ||
self.assertEqual(response.status_code, 404) | self.assertEqual(response.status_code, 404) | ||
|
|
||
|
article2 = DateArticle(title="example", author=author) | ||
|
|||
article2.date_created = first_second_of_feb.date() | |||
article2.save() | |||
response = self.client.get('/views/date_based/datefield/archive_month/2004/02/') | |||
self.assertEqual(response.status_code, 200) | |||
|
|||
article2.date_created = (first_second_of_feb-two_seconds).date() | |||
article2.save() | |||
response = self.client.get('/views/date_based/datefield/archive_month/2004/02/') | |||
self.assertEqual(response.status_code, 404) | |||
|
|||
article2.date_created = (first_second_of_mar-two_seconds).date() | |||
article2.save() | |||
response = self.client.get('/views/date_based/datefield/archive_month/2004/02/') | |||
self.assertEqual(response.status_code, 200) | |||
|
|||
article2.date_created = first_second_of_mar.date() | |||
article2.save() | |||
response = self.client.get('/views/date_based/datefield/archive_month/2004/02/') | |||
self.assertEqual(response.status_code, 404) | |||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1 @@ | |||
This template intentionally left blank |