Add new talk voting tests. (EuroPython#1124)

* Add new talk voting tests.

* Replace the get_default_conference implementation with a factory.

* Address review comments.

Author: umgelurgel

conference/talk_voting.py

@@ -87,7 +87,7 @@ def talk_voting(request):
 def find_talks(user, conference, extra_filters):
     """
     This prepares a queryset of Talks with custom data, with an option to pass
-    addtinal filters related to which talks we want to show.
+    additional filters related to which talks we want to show.
     """
     talks = (
         Talk.objects.filter(

docker-compose.yml

@@ -10,8 +10,8 @@ services:
       PYTHONDONTWRITEBYTECODE: 1
       DJANGO_SETTINGS_MODULE: "pycon.dev_settings"
       SECRET_KEY: "secret"
-    command: ["./manage.py migrate --no-input && ./manage.py runserver 0.0.0.0:8000"]
+    command: ["./manage.py migrate --no-input && ./manage.py runserver 0.0.0.0:8888"]
     volumes:
       - .:/code
     ports:
-      - "8000:8000"
+      - "8888:8888"

tests/common_tools.py

@@ -1,20 +1,20 @@
 import http.client
-from datetime import date, timedelta
+from datetime import date
 from urllib.parse import urlparse
 
 from wsgiref.simple_server import make_server
 
 from django.conf import settings
 from django.core.cache import cache
-from django.utils import timezone
 
 from django_factory_boy import auth as auth_factories
 
 from assopy.models import Vat, VatFare
+from conference.accounts import get_or_create_attendee_profile_for_new_user
 from conference.models import AttendeeProfile, Conference, TALK_STATUS, Fare
 from conference.fares import pre_create_typical_fares_for_conference
 from tests.factories import (
-    AssopyUserFactory, OrderFactory, TalkFactory, SpeakerFactory, TalkSpeakerFactory,
+    AssopyUserFactory, OrderFactory, TalkFactory, SpeakerFactory, TalkSpeakerFactory, ConferenceFactory,
 )
 
 HTTP_OK = 200
@@ -190,28 +190,22 @@ def create_valid_ticket_for_user_and_fare(user, fare=None):
     return ticket
 
 
-def get_default_conference(end=None):
-    if not end:
-        end = timezone.now() + timedelta(days=35)
+def get_default_conference(**kwargs):
+    return ConferenceFactory(**kwargs)
 
-    conference, _ = Conference.objects.get_or_create(
-        code=settings.CONFERENCE_CONFERENCE,
-        name="Europython 2020",
-        # For easier testing open CFP
-        cfp_start=timezone.now() - timedelta(days=3),
-        cfp_end=timezone.now() + timedelta(days=3),
-        conference_start=timezone.now() + timedelta(days=30),
-        conference_end=end,
-        # For easier testing also start with open voting
-        voting_start=timezone.now() - timedelta(days=3),
-        voting_end=timezone.now() + timedelta(days=3),
-    )
-
-    return conference
 
+def create_talk_for_user(user, **kwargs):
+    if user is None:
+        user = create_user()
 
-def create_talk_for_user(user):
-    talk = TalkFactory(status=TALK_STATUS.proposed, created_by=user)
+    talk = TalkFactory(**{'status': TALK_STATUS.proposed, 'created_by': user, **kwargs})
     speaker = SpeakerFactory(user=user)
     TalkSpeakerFactory(talk=talk, speaker=speaker)
     return talk
+
+
+def create_user():
+    user = auth_factories.UserFactory(is_active=True)
+    AssopyUserFactory(user=user)
+    get_or_create_attendee_profile_for_new_user(user)
+    return user

tests/factories.py

@@ -243,32 +243,19 @@ class Meta:
 class ConferenceFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = "conference.Conference"
+        django_get_or_create = ('code',)
 
+    name = 'EuroPython 2020'
     code = settings.CONFERENCE_CONFERENCE
-    name = factory.Faker("sentence", nb_words=6, variable_nb_words=True)
 
-    cfp_start = factory.LazyAttribute(
-        lambda conf: conf.conference_start - timedelta(days=50)
-    )
-    cfp_end = factory.LazyAttribute(
-        lambda conf: conf.cfp_start + timedelta(days=+20)
-    )
-
-    @factory.lazy_attribute
-    def conference_start(self):
-        return fake.date_time_this_decade(before_now=True, after_now=True).date()
-
-    # conference_start = factory.Faker('date_time_this_decade', before_now=True, after_now=True)
-    conference_end = factory.LazyAttribute(
-        lambda conf: (conf.conference_start + timedelta(days=+5))
-    )
-
-    voting_start = factory.LazyAttribute(
-        lambda conf: conf.cfp_end + timedelta(days=10)
-    )
-    voting_end = factory.LazyAttribute(
-        lambda conf: conf.voting_start + timedelta(days=5)
-    )
+    conference_start = factory.LazyAttribute(lambda obj: timezone.now() + timedelta(days=30))
+    conference_end = factory.LazyAttribute(lambda obj: obj.conference_start + timedelta(days=5))
+    cfp_start = factory.LazyAttribute(lambda obj: obj.conference_start - timedelta(days=33))
+    cfp_end = factory.LazyAttribute(lambda obj: obj.cfp_start + timedelta(days=6))
+    # During a real conference, voting would start after the cfp ends, not run concurrently.
+    # The opposite is the case here to make testing easier.
+    voting_start = factory.LazyAttribute(lambda obj: obj.cfp_start)
+    voting_end = factory.LazyAttribute(lambda obj: obj.cfp_end)
 
 
 class TicketFactory(factory.django.DjangoModelFactory):

tests/test_homepage.py

@@ -5,7 +5,6 @@
 from django.conf import settings
 from django.utils import timezone
 from tests.common_tools import template_used
-from conference.models import News
 from tests.factories import ConferenceFactory, SponsorFactory, NewsFactory
 from tests.common_tools import get_default_conference
 
@@ -54,7 +53,7 @@ def test_homepage_contains_last_3_news_for_current_conference(db, client):
 
 def test_homepage_doesnt_display_news_from_non_current_conference(db, client):
     current_conf = get_default_conference()
-    other_conf = ConferenceFactory(code="other")
+    other_conf = ConferenceFactory(code="other", name="other conf")
 
     current_news = NewsFactory(
         conference=current_conf,