diff --git a/Django/mysite/polls/models.py b/Django/mysite/polls/models.py index 44b2d7c..ab7ddba 100644 --- a/Django/mysite/polls/models.py +++ b/Django/mysite/polls/models.py @@ -12,8 +12,8 @@ class Question(models.Model): return self.question_text def was_published_recently(self): - return self.pub_date >= timezone.now() - datetime.timedelta(days=1) - + now = timezone.now() + return now - datetime.timedelta(days=1) <= self.pub_date <= now class Choice(models.Model): question = models.ForeignKey(Question, on_delete=models.CASCADE) @@ -22,5 +22,3 @@ class Choice(models.Model): def __str__(self): return self.choice_text - - diff --git a/Django/mysite/polls/tests.py b/Django/mysite/polls/tests.py index 7ce503c..01c97d0 100644 --- a/Django/mysite/polls/tests.py +++ b/Django/mysite/polls/tests.py @@ -1,3 +1,102 @@ +import datetime + from django.test import TestCase +from django.utils import timezone +from django.urls import reverse + +from .models import Question + + +def create_question(question_text, days): + """ + Create a question with the given `question_text` and published the + given number of `days` offset to now (negative for questions published + in the past, positive for questions that have yet to be published). + """ + time = timezone.now() + datetime.timedelta(days=days) + return Question.objects.create(question_text=question_text, pub_date=time) + +class QuestionModelTests(TestCase): + def test_was_published_recently_with_future_question(self): + """ + was_published_recently() returns False for questions whose pub_date + is in the future. + """ + time = timezone.now() + datetime.timedelta(days=30) + future_question = Question(pub_date=time) + self.assertIs(future_question.was_published_recently(), False) + + def test_was_published_recently_with_old_question(self): + """ + was_published_recently() returns False for questions whose pub_date + is older than 1 day. + """ + time = timezone.now() - datetime.timedelta(days=1, seconds=1) + old_question = Question(pub_date=time) + self.assertIs(old_question.was_published_recently(), False) + + + def test_was_published_recently_with_recent_question(self): + """ + was_published_recently() returns True for questions whose pub_date + is within the last day. + """ + time = timezone.now() - datetime.timedelta(hours=23, minutes=59, seconds=59) + recent_question = Question(pub_date=time) + self.assertIs(recent_question.was_published_recently(), True) + +class QuestionIndexViewTests(TestCase): + + def test_no_questions(self): + """ + If no questions exist, an appropriate message is displayed. + """ + response = self.client.get(reverse("polls:index")) + self.assertEqual(response.status_code, 200) + self.assertContains(response, "No polls are available.") + self.assertQuerySetEqual(response.context["latest_question_list"], []) + + def test_future_question(self): + """ + The detail view of a question with a pub_date in the future + returns a 404 not found. + """ + future_question = create_question(question_text="Future question.", days=5) + url = reverse("polls:detail", args=(future_question.id,)) + response = self.client.get(url) + self.assertEqual(response.status_code, 404) + + def test_past_question(self): + """ + The detail view of a question with a pub_date in the past + displays the question's text. + """ + past_question = create_question(question_text="Past Question.", days=-5) + url = reverse("polls:detail", args=(past_question.id,)) + response = self.client.get(url) + self.assertContains(response, past_question.question_text) + + def test_future_question_and_past_question(self): + """ + Even if both past and future questions exist, only past questions + are displayed. + """ + question = create_question(question_text="Past question.", days=-30) + create_question(question_text="Future question.", days=30) + response = self.client.get(reverse("polls:index")) + self.assertQuerySetEqual( + response.context["latest_question_list"], + [question], + ) -# Create your tests here. + def test_two_past_questions(self): + """ + The questions index page may display multiple questions. + """ + question1 = create_question(question_text="Past question 1.", days=-30) + question2 = create_question(question_text="Past question 2.", days=-5) + response = self.client.get(reverse("polls:index")) + self.assertQuerySetEqual( + response.context["latest_question_list"], + [question2, question1], + ) diff --git a/Django/mysite/polls/views.py b/Django/mysite/polls/views.py index 23f2af3..c90e51d 100644 --- a/Django/mysite/polls/views.py +++ b/Django/mysite/polls/views.py @@ -3,6 +3,7 @@ from django.http import HttpResponse, HttpResponseRedirect from django.urls import reverse from django.db.models import F from django.views import generic +from django.utils import timezone @@ -16,8 +17,13 @@ class IndexView(generic.ListView): context_object_name = "latest_question_list" def get_queryset(self): - """Return the last five published questions.""" - return Question.objects.order_by("-pub_date")[:5] + """ + Return the last five published questions (not including those set to be + published in the future). + """ + return Question.objects.filter(pub_date__lte=timezone.now()).order_by("-pub_date")[ + :5 + ] class DetailView(generic.DetailView): @@ -28,7 +34,13 @@ class DetailView(generic.DetailView): class ResultsView(generic.DetailView): model = Question template_name = "polls/results.html" - + + def get_queryset(self): + """ + Excludes any questions that aren't published yet. + """ + return Question.objects.filter(pub_date__lte=timezone.now()) + def vote(request, question_id): question = get_object_or_404(Question, pk=question_id) try: