refactor: upgrading factory-boy.

This commit is contained in:
Awais Qureshi
2021-04-14 15:17:32 +05:00
parent af17c05b9c
commit 6b6e87e797
10 changed files with 28 additions and 32 deletions

View File

@@ -21,7 +21,7 @@ from openedx.core.djangoapps.credit.models import (
from common.djangoapps.util.date_utils import to_timestamp
class CreditCourseFactory(factory.DjangoModelFactory):
class CreditCourseFactory(factory.django.DjangoModelFactory):
class Meta:
model = CreditCourse
@@ -29,14 +29,14 @@ class CreditCourseFactory(factory.DjangoModelFactory):
enabled = True
class CreditRequirementFactory(factory.DjangoModelFactory):
class CreditRequirementFactory(factory.django.DjangoModelFactory):
class Meta:
model = CreditRequirement
course = factory.SubFactory(CreditCourseFactory)
class CreditRequirementStatusFactory(factory.DjangoModelFactory):
class CreditRequirementStatusFactory(factory.django.DjangoModelFactory):
class Meta:
model = CreditRequirementStatus
@@ -44,7 +44,7 @@ class CreditRequirementStatusFactory(factory.DjangoModelFactory):
status = CreditRequirementStatus.REQUIREMENT_STATUS_CHOICES[0][0]
class CreditProviderFactory(factory.DjangoModelFactory):
class CreditProviderFactory(factory.django.DjangoModelFactory):
class Meta:
model = CreditProvider
@@ -52,14 +52,14 @@ class CreditProviderFactory(factory.DjangoModelFactory):
provider_url = FuzzyText(prefix='http://')
class CreditEligibilityFactory(factory.DjangoModelFactory):
class CreditEligibilityFactory(factory.django.DjangoModelFactory):
class Meta:
model = CreditEligibility
course = factory.SubFactory(CreditCourseFactory)
class CreditRequestFactory(factory.DjangoModelFactory):
class CreditRequestFactory(factory.django.DjangoModelFactory):
class Meta:
model = CreditRequest

View File

@@ -11,14 +11,14 @@ from openedx.core.djangoapps.site_configuration.tests.factories import SiteFacto
from common.djangoapps.student.tests.factories import CourseEnrollmentFactory
class ScheduleExperienceFactory(factory.DjangoModelFactory):
class ScheduleExperienceFactory(factory.django.DjangoModelFactory):
class Meta:
model = models.ScheduleExperience
experience_type = models.ScheduleExperience.EXPERIENCES.default
class ScheduleFactory(factory.DjangoModelFactory): # lint-amnesty, pylint: disable=missing-class-docstring
class ScheduleFactory(factory.django.DjangoModelFactory): # lint-amnesty, pylint: disable=missing-class-docstring
class Meta:
model = models.Schedule
@@ -28,7 +28,7 @@ class ScheduleFactory(factory.DjangoModelFactory): # lint-amnesty, pylint: disa
experience = factory.RelatedFactory(ScheduleExperienceFactory, 'schedule')
class ScheduleConfigFactory(factory.DjangoModelFactory): # lint-amnesty, pylint: disable=missing-class-docstring
class ScheduleConfigFactory(factory.django.DjangoModelFactory): # lint-amnesty, pylint: disable=missing-class-docstring
class Meta:
model = models.ScheduleConfig

View File

@@ -14,6 +14,7 @@ from common.djangoapps.course_modes.models import CourseMode
from common.djangoapps.course_modes.tests.factories import CourseModeFactory
from common.djangoapps.student.tests.factories import UserFactory
from lms.djangoapps.courseware.models import DynamicUpgradeDeadlineConfiguration
from openedx.core.djangoapps.content.course_overviews.tests.factories import CourseOverviewFactory
from openedx.core.djangoapps.schedules.models import Schedule
from openedx.core.djangoapps.user_api.preferences.api import set_user_preference
from openedx.core.djangolib.testing.utils import CacheIsolationTestCase
@@ -36,6 +37,7 @@ class TestAccess(CacheIsolationTestCase):
CourseDurationLimitConfig.objects.create(enabled=True, enabled_as_of=datetime(2018, 1, 1, tzinfo=UTC))
DynamicUpgradeDeadlineConfiguration.objects.create(enabled=True)
self.course = CourseOverviewFactory.create(start=datetime(2018, 1, 1, tzinfo=UTC), self_paced=True)
def assertDateInMessage(self, date, message): # lint-amnesty, pylint: disable=missing-function-docstring
# First, check that the formatted version is in there
@@ -100,10 +102,7 @@ class TestAccess(CacheIsolationTestCase):
else:
course_upgrade_deadline = None
enrollment = CourseEnrollmentFactory.create(
course__start=datetime(2018, 1, 1, tzinfo=UTC),
course__self_paced=True,
)
enrollment = CourseEnrollmentFactory.create(course=self.course)
CourseModeFactory.create(
course_id=enrollment.course.id,
mode_slug=CourseMode.VERIFIED,
@@ -140,10 +139,7 @@ class TestAccess(CacheIsolationTestCase):
enrollment date, content_availability_date is set to max of course start
or enrollment date
"""
enrollment = CourseEnrollmentFactory.create(
course__start=datetime(2018, 1, 1, tzinfo=UTC),
course__self_paced=True,
)
enrollment = CourseEnrollmentFactory.create(course=self.course)
CourseModeFactory.create(
course_id=enrollment.course.id,
mode_slug=CourseMode.VERIFIED,