From 8f6702c44aa422ae4dc4979580279ea57fa97bf4 Mon Sep 17 00:00:00 2001 From: Bryann Valderrama Date: Mon, 16 Dec 2024 08:13:24 -0500 Subject: [PATCH] temp: add sample unit test --- .../schedules/tests/test_filters.py | 72 +++++++++---------- .../schedules/tests/test_resolvers.py | 39 ++++++++++ 2 files changed, 75 insertions(+), 36 deletions(-) diff --git a/openedx/core/djangoapps/schedules/tests/test_filters.py b/openedx/core/djangoapps/schedules/tests/test_filters.py index 94235eb40012..b8002aa11a43 100644 --- a/openedx/core/djangoapps/schedules/tests/test_filters.py +++ b/openedx/core/djangoapps/schedules/tests/test_filters.py @@ -18,46 +18,46 @@ class TestScheduleQuerySetRequestedPipelineStep(PipelineStep): """Pipeline step class to test a configured pipeline step""" - filtered_schedules = Mock(spec=QuerySet) + # filtered_schedules = Mock(spec=QuerySet) def run_filter(self, schedules): # pylint: disable=arguments-differ """Pipeline step to filter the schedules""" return { - "schedules": self.filtered_schedules, + "schedules": schedules, } -@skip_unless_lms -class ScheduleQuerySetRequestedFiltersTest(SchedulesResolverTestMixin, ModuleStoreTestCase): - """ - Tests for the Open edX Filters associated with the schedule queryset requested. - - The following filters are tested: - - ScheduleQuerySetRequested - """ - - def setUp(self): - super().setUp() - self.resolver = BinnedSchedulesBaseResolver( - async_send_task=Mock(name="async_send_task"), - site=self.site, - target_datetime=datetime.datetime.now(), - day_offset=3, - bin_num=1, - ) - - @override_settings( - OPEN_EDX_FILTERS_CONFIG={ - "org.openedx.learning.schedule.queryset.requested.v1": { - "pipeline": [ - "openedx.core.djangoapps.schedules.tests.test_filters.TestScheduleQuerySetRequestedPipelineStep", - ], - "fail_silently": False, - }, - }, - ) - def test_schedule_queryset_requested_filter(self) -> None: - """Test to verify the schedule queryset was modified by the pipeline step.""" - schedules = self.resolver.get_schedules_with_target_date_by_bin_and_orgs() - - self.assertEqual(TestScheduleQuerySetRequestedPipelineStep.filtered_schedules, schedules) +# @skip_unless_lms +# class ScheduleQuerySetRequestedFiltersTest(SchedulesResolverTestMixin, ModuleStoreTestCase): +# """ +# Tests for the Open edX Filters associated with the schedule queryset requested. + +# The following filters are tested: +# - ScheduleQuerySetRequested +# """ + +# def setUp(self): +# super().setUp() +# self.resolver = BinnedSchedulesBaseResolver( +# async_send_task=Mock(name="async_send_task"), +# site=self.site, +# target_datetime=datetime.datetime.now(), +# day_offset=3, +# bin_num=1, +# ) + +# @override_settings( +# OPEN_EDX_FILTERS_CONFIG={ +# "org.openedx.learning.schedule.queryset.requested.v1": { +# "pipeline": [ +# "openedx.core.djangoapps.schedules.tests.test_filters.TestScheduleQuerySetRequestedPipelineStep", +# ], +# "fail_silently": False, +# }, +# }, +# ) +# def test_schedule_queryset_requested_filter(self) -> None: +# """Test to verify the schedule queryset was modified by the pipeline step.""" +# schedules = self.resolver.get_schedules_with_target_date_by_bin_and_orgs() + +# self.assertEqual(TestScheduleQuerySetRequestedPipelineStep.schedules, schedules) diff --git a/openedx/core/djangoapps/schedules/tests/test_resolvers.py b/openedx/core/djangoapps/schedules/tests/test_resolvers.py index 5c2b592b8e25..c1c526bdf4a9 100644 --- a/openedx/core/djangoapps/schedules/tests/test_resolvers.py +++ b/openedx/core/djangoapps/schedules/tests/test_resolvers.py @@ -134,6 +134,45 @@ def test_external_course_updates(self, bucket): assert len(schedules) == 2 assert {s.enrollment for s in schedules} == {enrollment1, enrollment2} + @override_settings( + OPEN_EDX_FILTERS_CONFIG={ + "org.openedx.learning.schedule.queryset.requested.v1": { + "pipeline": [ + "openedx.core.djangoapps.schedules.tests.test_filters.TestScheduleQuerySetRequestedPipelineStep", + ], + "fail_silently": False, + }, + }, + ) + def test_schedule_filter(self, bucket): + """Confirm that we exclude enrollments in the external course updates experiment""" + user = UserFactory() + overview1 = CourseOverviewFactory(has_highlights=False) # set has_highlights just to avoid a modulestore lookup + overview2 = CourseOverviewFactory(has_highlights=False) + + # We need to enroll with a request, because our specific experiment code expects it + self.addCleanup(crum.set_current_request, None) + request = RequestFactory().get(self.site) + request.user = user + crum.set_current_request(request) + enrollment1 = CourseEnrollment.enroll(user, overview1.id) + with override_experiment_waffle_flag(_EXTERNAL_COURSE_UPDATES_FLAG, bucket=bucket): + enrollment2 = CourseEnrollment.enroll(user, overview2.id) + + # OK, at this point, we'd expect course1 to be returned, but course2's enrollment to be excluded by the + # experiment. Note that the experiment waffle is currently inactive, but they should still be excluded because + # they were bucketed at enrollment time. + bin_num = BinnedSchedulesBaseResolver.bin_num_for_user_id(user.id) + resolver = BinnedSchedulesBaseResolver(None, self.site, datetime.datetime.now(pytz.UTC), 0, bin_num) + resolver.schedule_date_field = 'created' + schedules = resolver.get_schedules_with_target_date_by_bin_and_orgs() + + if bucket == 1: + assert len(schedules) == 1 + assert schedules[0].enrollment == enrollment1 + else: + assert len(schedules) == 2 + assert {s.enrollment for s in schedules} == {enrollment1, enrollment2} @skip_unless_lms class TestCourseUpdateResolver(SchedulesResolverTestMixin, ModuleStoreTestCase):