From 390122ec933f842182bfb88bcf2511e52f86df40 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Mon, 24 Jun 2019 14:23:08 -0400 Subject: [PATCH] Make CourseOverviewFactory create new courses every time (unless otherwise specified) --- common/djangoapps/student/tests/test_views.py | 2 +- .../djangoapps/content/course_overviews/tests/factories.py | 4 +++- .../schedules/management/commands/tests/send_email_base.py | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/common/djangoapps/student/tests/test_views.py b/common/djangoapps/student/tests/test_views.py index ffeaa1db3b..42e34a54e9 100644 --- a/common/djangoapps/student/tests/test_views.py +++ b/common/djangoapps/student/tests/test_views.py @@ -516,7 +516,7 @@ class StudentDashboardTests(SharedModuleStoreTestCase, MilestonesTestCaseMixin, course_overview = CourseOverviewFactory( start=self.TOMORROW, self_paced=True, enrollment_end=self.TOMORROW ) - course_enrollment = CourseEnrollmentFactory(user=self.user) + course_enrollment = CourseEnrollmentFactory(user=self.user, course_id=course_overview.id) entitlement = CourseEntitlementFactory(user=self.user, enrollment_course_run=course_enrollment) course_runs = [{ 'key': six.text_type(course_overview.id), diff --git a/openedx/core/djangoapps/content/course_overviews/tests/factories.py b/openedx/core/djangoapps/content/course_overviews/tests/factories.py index e898ff2b02..d344795275 100644 --- a/openedx/core/djangoapps/content/course_overviews/tests/factories.py +++ b/openedx/core/djangoapps/content/course_overviews/tests/factories.py @@ -13,10 +13,12 @@ class CourseOverviewFactory(DjangoModelFactory): class Meta(object): model = CourseOverview django_get_or_create = ('id', ) + exclude = ('run', ) version = CourseOverview.VERSION pre_requisite_courses = [] org = 'edX' + run = factory.Sequence('2012_Fall_{}'.format) @factory.lazy_attribute def _pre_requisite_courses_json(self): @@ -28,7 +30,7 @@ class CourseOverviewFactory(DjangoModelFactory): @factory.lazy_attribute def id(self): - return CourseLocator(self.org, 'toy', '2012_Fall') + return CourseLocator(self.org, 'toy', self.run) @factory.lazy_attribute def display_name(self): diff --git a/openedx/core/djangoapps/schedules/management/commands/tests/send_email_base.py b/openedx/core/djangoapps/schedules/management/commands/tests/send_email_base.py index 3eb6492499..e80dae6bda 100644 --- a/openedx/core/djangoapps/schedules/management/commands/tests/send_email_base.py +++ b/openedx/core/djangoapps/schedules/management/commands/tests/send_email_base.py @@ -139,6 +139,8 @@ class ScheduleSendEmailTestMixin(FilteredQueryCountMixin): factory_kwargs.setdefault('start', target_day) factory_kwargs.setdefault('upgrade_deadline', upgrade_deadline) factory_kwargs.setdefault('enrollment__course__self_paced', True) + # Make all schedules in the same course + factory_kwargs.setdefault('enrollment__course__run', '2012_Fall') if hasattr(self, 'experience_type'): factory_kwargs.setdefault('experience__experience_type', self.experience_type) schedule = ScheduleFactory(**factory_kwargs)