Make sure that the round has a form when testing

opentech/apply/funds/tests/factories/models.py

@@ -5,12 +5,14 @@ import factory
 import wagtail_factories
 
 from opentech.apply.funds.models import (
+    AbstractRelatedForm,
     ApplicationForm,
     FundType,
     FundForm,
     LabForm,
     LabType,
     Round,
+    RoundForm,
 )
 from opentech.apply.funds.workflow import Action, Phase, Stage, Workflow
 
@@ -26,6 +28,7 @@ __all__ = [
     'FundFormFactory',
     'ApplicationFormFactory',
     'RoundFactory',
+    'RoundFormFactory',
     'LabFactory',
     'LabFormFactory',
 ]
@@ -162,11 +165,17 @@ class FundTypeFactory(wagtail_factories.PageFactory):
                 )
 
 
-class FundFormFactory(factory.DjangoModelFactory):
+class AbstractRelatedFormFactory(factory.DjangoModelFactory):
+    class Meta:
+        model = AbstractRelatedForm
+        abstract = True
+    form = factory.SubFactory('opentech.apply.funds.tests.factories.ApplicationFormFactory')
+
+
+class FundFormFactory(AbstractRelatedFormFactory):
     class Meta:
         model = FundForm
     fund = factory.SubFactory(FundTypeFactory, parent=None)
-    form = factory.SubFactory('opentech.apply.funds.tests.factories.ApplicationFormFactory')
 
 
 class ApplicationFormFactory(factory.DjangoModelFactory):
@@ -176,6 +185,7 @@ class ApplicationFormFactory(factory.DjangoModelFactory):
     name = factory.Faker('word')
     form_fields = blocks.CustomFormFieldsFactory
 
+
 class RoundFactory(wagtail_factories.PageFactory):
     class Meta:
         model = Round
@@ -185,6 +195,12 @@ class RoundFactory(wagtail_factories.PageFactory):
     end_date = factory.LazyFunction(lambda: datetime.date.today() + datetime.timedelta(days=7))
 
 
+class RoundFormFactory(AbstractRelatedFormFactory):
+    class Meta:
+        model = RoundForm
+    round = factory.SubFactory(RoundFactory, parent=None)
+
+
 class LabFactory(wagtail_factories.PageFactory):
     class Meta:
         model = LabType
@@ -197,8 +213,7 @@ class LabFactory(wagtail_factories.PageFactory):
     workflow = factory.LazyAttribute(lambda o: list(FundType.WORKFLOWS.keys())[o.workflow_stages - 1])
 
 
-class LabFormFactory(factory.DjangoModelFactory):
+class LabFormFactory(AbstractRelatedFormFactory):
     class Meta:
         model = LabForm
     lab = factory.SubFactory(LabFactory, parent=None)
-    form = factory.SubFactory('opentech.apply.tests.factories.ApplicationFormFactory')

opentech/apply/funds/tests/test_models.py

@@ -15,11 +15,11 @@ from opentech.apply.funds.workflow import SingleStage
 from .factories import (
     ApplicationFormFactory,
     CustomFormFieldsFactory,
-    FundFormFactory,
     FundTypeFactory,
     LabFactory,
     LabFormFactory,
     RoundFactory,
+    RoundFormFactory,
 )
 
 
@@ -192,8 +192,8 @@ class TestFormSubmission(TestCase):
         self.site.root_page = fund
         self.site.save()
 
-        FundFormFactory(fund=fund, form=form)
         self.round_page = RoundFactory(parent=fund)
+        RoundFormFactory(round=self.round_page, form=form)
         self.lab_page = LabFactory()
         LabFormFactory(lab=self.lab_page, form=form)