From 11fcebab5f9aecd112d958a8c5f1417268a469e6 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Thu, 2 Aug 2018 11:49:13 +0100
Subject: [PATCH] fixup! Move the remaining models into the relevant files
---
.../apply/funds/tests/factories/models.py | 40 +++++++++----------
.../apply/review/tests/factories/models.py | 23 +++++------
2 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/opentech/apply/funds/tests/factories/models.py b/opentech/apply/funds/tests/factories/models.py
index a305c94ab..8a2854669 100644
--- a/opentech/apply/funds/tests/factories/models.py
+++ b/opentech/apply/funds/tests/factories/models.py
@@ -5,16 +5,17 @@ import factory
import wagtail_factories
from opentech.apply.funds.models import (
- AbstractRelatedForm,
- ApplicationForm,
ApplicationSubmission,
ApplicationRevision,
FundType,
- FundForm,
- LabForm,
LabType,
Round,
- RoundForm,
+)
+from opentech.apply.funds.models.forms import (
+ ApplicationForm,
+ ApplicationBaseForm,
+ LabBaseForm,
+ RoundBaseForm,
)
from opentech.apply.users.tests.factories import StaffFactory, UserFactory
from opentech.apply.stream_forms.testing.factories import FormDataFactory
@@ -24,14 +25,14 @@ from . import blocks
__all__ = [
'FundTypeFactory',
- 'FundFormFactory',
+ 'ApplicationBaseFormFactory',
'ApplicationFormFactory',
'ApplicationRevisionFactory',
'ApplicationSubmissionFactory',
'RoundFactory',
- 'RoundFormFactory',
+ 'RoundBaseFormFactory',
'LabFactory',
- 'LabFormFactory',
+ 'LabBaseFormFactory',
]
@@ -72,8 +73,8 @@ class FundTypeFactory(wagtail_factories.PageFactory):
review_fields = review_build_form(kwargs)
for _ in self.workflow.stages:
# Generate a form based on all defined fields on the model
- FundFormFactory(
- fund=self,
+ ApplicationBaseFormFactory(
+ application=self,
**fields,
)
ReviewFormFactory(**review_fields)
@@ -81,15 +82,14 @@ class FundTypeFactory(wagtail_factories.PageFactory):
class AbstractRelatedFormFactory(factory.DjangoModelFactory):
class Meta:
- model = AbstractRelatedForm
abstract = True
form = factory.SubFactory('opentech.apply.funds.tests.factories.ApplicationFormFactory')
-class FundFormFactory(AbstractRelatedFormFactory):
+class ApplicationBaseFormFactory(AbstractRelatedFormFactory):
class Meta:
- model = FundForm
- fund = factory.SubFactory(FundTypeFactory, parent=None)
+ model = ApplicationBaseForm
+ application = factory.SubFactory(FundTypeFactory, parent=None)
class ApplicationFormFactory(factory.DjangoModelFactory):
@@ -121,7 +121,7 @@ class RoundFactory(wagtail_factories.PageFactory):
fields = build_form(kwargs, prefix='form')
for _ in self.workflow.stages:
# Generate a form based on all defined fields on the model
- RoundFormFactory(
+ RoundBaseFormFactory(
round=self,
**fields,
)
@@ -132,9 +132,9 @@ class TodayRoundFactory(RoundFactory):
end_date = factory.LazyFunction(lambda: datetime.date.today() + datetime.timedelta(days=7))
-class RoundFormFactory(AbstractRelatedFormFactory):
+class RoundBaseFormFactory(AbstractRelatedFormFactory):
class Meta:
- model = RoundForm
+ model = RoundBaseForm
round = factory.SubFactory(RoundFactory, parent=None)
@@ -156,15 +156,15 @@ class LabFactory(wagtail_factories.PageFactory):
fields = build_form(kwargs, prefix='form')
for _ in self.workflow.stages:
# Generate a form based on all defined fields on the model
- LabFormFactory(
+ LabBaseFormFactory(
lab=self,
**fields,
)
-class LabFormFactory(AbstractRelatedFormFactory):
+class LabBaseFormFactory(AbstractRelatedFormFactory):
class Meta:
- model = LabForm
+ model = LabBaseForm
lab = factory.SubFactory(LabFactory, parent=None)
diff --git a/opentech/apply/review/tests/factories/models.py b/opentech/apply/review/tests/factories/models.py
index fd2374a33..2be83c8a6 100644
--- a/opentech/apply/review/tests/factories/models.py
+++ b/opentech/apply/review/tests/factories/models.py
@@ -2,18 +2,18 @@ from collections import defaultdict
import factory
-from opentech.apply.funds.models import AbstractRelatedReviewForm, FundReviewForm
+from opentech.apply.funds.models.forms import ApplicationBaseReviewForm
from opentech.apply.funds.tests.factories import ApplicationSubmissionFactory, FundTypeFactory
-from opentech.apply.review.options import YES, NO, MAYBE
+from opentech.apply.stream_forms.testing.factories import AddFormFieldsMetaclass
from opentech.apply.users.tests.factories import StaffFactory
-from opentech.apply.review.models import Review, ReviewForm
-from opentech.apply.review.views import get_fields_for_stage
-from opentech.apply.stream_forms.testing.factories import AddFormFieldsMetaclass
+from ...options import YES, NO, MAYBE
+from ...models import Review, ReviewForm
+from ...views import get_fields_for_stage
from . import blocks
-__all__ = ['ReviewFactory', 'ReviewFormFactory', 'AbstractRelatedReviewFormFactory', 'FundReviewFormFactory',
+__all__ = ['ReviewFactory', 'ReviewFormFactory', 'ApplicationBaseReviewFormFactory',
'ReviewFundTypeFactory', 'ReviewApplicationSubmissionFactory']
@@ -80,7 +80,6 @@ class ReviewFormFactory(factory.DjangoModelFactory):
class AbstractRelatedReviewFormFactory(factory.DjangoModelFactory):
class Meta:
- model = AbstractRelatedReviewForm
abstract = True
form = factory.SubFactory(ReviewFormFactory)
@@ -93,16 +92,16 @@ class ReviewFundTypeFactory(FundTypeFactory):
fields = build_form(kwargs, prefix='form')
for _ in self.workflow.stages:
# Generate a form based on all defined fields on the model
- FundReviewFormFactory(
- fund=self,
+ ApplicationBaseReviewFormFactory(
+ application=self,
**fields
)
-class FundReviewFormFactory(AbstractRelatedReviewFormFactory):
+class ApplicationBaseReviewFormFactory(AbstractRelatedReviewFormFactory):
class Meta:
- model = FundReviewForm
- fund = factory.SubFactory(ReviewFundTypeFactory, parent=None)
+ model = ApplicationBaseReviewForm
+ application = factory.SubFactory(ReviewFundTypeFactory, parent=None)
class ReviewApplicationSubmissionFactory(ApplicationSubmissionFactory):
--
GitLab