From c748c33530e3e3e21bca3a46e559e1f5651d022c Mon Sep 17 00:00:00 2001
From: Collin Preston <collin_preston@yahoo.com>
Date: Thu, 30 May 2024 08:32:26 -0400
Subject: [PATCH 1/2] Repair test based on dates

---
 cms/api_test.py | 40 +++++++++++++---------------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/cms/api_test.py b/cms/api_test.py
index 7b99c9ec5c..276a9222f9 100644
--- a/cms/api_test.py
+++ b/cms/api_test.py
@@ -290,7 +290,7 @@ def test_create_courseware_page():
 
 
 @pytest.mark.django_db
-def test_create_featured_items():
+def test_create_featured_items():  # noqa: D103
     # pytest does not clear cache thus if we have a cache value set, it will persist between tests and test runs
     # thus we need to clear the cache before running the test
     redis_cache = caches["redis"]
@@ -308,38 +308,26 @@ def test_create_featured_items():
     # Course that starts in the future but is open for enrollment
     enrollable_future_course = CourseFactory.create(page=None, live=True)
     CoursePageFactory.create(course=enrollable_future_course, live=True)
-    enrollable_future_courserun = CourseRunFactory.create(
+    enrollable_future_courserun = CourseRunFactory.create(  # noqa: F841
         course=enrollable_future_course,
         live=True,
-        in_future=True,
+        start_date=future_date,
+        enrollment_start=further_past_date,
+        enrollment_end=further_future_date,
+        end_date=furthest_future_date,
     )
-    enrollable_future_courserun.enrollment_start = further_past_date
-    enrollable_future_courserun.start_date = future_date
-    enrollable_future_courserun.enrollment_end = further_future_date
-    enrollable_future_courserun.end_date = furthest_future_date
-    enrollable_future_courserun.save()
 
     # Course that is open for enrollment, but starts after the one above
     enrollable_other_future_course = CourseFactory.create(page=None, live=True)
     CoursePageFactory.create(course=enrollable_other_future_course, live=True)
-    enrollable_other_future_courserun = CourseRunFactory.create(
+    enrollable_other_future_courserun = CourseRunFactory.create(  # noqa: F841
         course=enrollable_other_future_course,
         live=True,
-        in_future=True,
+        enrollment_start=further_past_date,
+        start_date=future_date + timedelta(days=2),
+        enrollment_end=further_future_date + timedelta(days=2),
+        end_date=furthest_future_date + timedelta(days=2)
     )
-    enrollable_other_future_courserun.enrollment_start = (
-        enrollable_future_courserun.enrollment_start
-    )
-    enrollable_other_future_courserun.start_date = (
-        enrollable_future_courserun.start_date + timedelta(days=2)
-    )
-    enrollable_other_future_courserun.enrollment_end = (
-        enrollable_future_courserun.enrollment_end + timedelta(days=2)
-    )
-    enrollable_other_future_courserun.end_date = (
-        enrollable_future_courserun.end_date + timedelta(days=2)
-    )
-    enrollable_other_future_courserun.save()
 
     # A self-paced course that is open for enrollment
     enrollable_self_paced_course = CourseFactory.create(page=None, live=True)
@@ -348,6 +336,7 @@ def test_create_featured_items():
         course=enrollable_self_paced_course,
         live=True,
         in_progress=True,
+        enrollment_end=further_future_date + timedelta(days=2),
     )
     self_paced_run.is_self_paced = True
     self_paced_run.save()
@@ -358,11 +347,8 @@ def test_create_featured_items():
         course=in_progress_course,
         live=True,
         in_progress=True,
+        enrollment_end=further_future_date + timedelta(days=2),
     )
-    in_progress_course.enrollment_start = further_past_date
-    in_progress_course.start_date = past_date
-    in_progress_course.enrollment_end = future_date
-    in_progress_course.end_date = further_future_date
 
     unenrollable_course = CourseFactory.create(page=None, live=False)
     CoursePageFactory.create(course=unenrollable_course, live=False)

From 4a06487b3918b8624645282b594531c087c659d6 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 30 May 2024 12:36:07 +0000
Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 cms/api_test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cms/api_test.py b/cms/api_test.py
index 276a9222f9..57f6588946 100644
--- a/cms/api_test.py
+++ b/cms/api_test.py
@@ -290,7 +290,7 @@ def test_create_courseware_page():
 
 
 @pytest.mark.django_db
-def test_create_featured_items():  # noqa: D103
+def test_create_featured_items():
     # pytest does not clear cache thus if we have a cache value set, it will persist between tests and test runs
     # thus we need to clear the cache before running the test
     redis_cache = caches["redis"]
@@ -326,7 +326,7 @@ def test_create_featured_items():  # noqa: D103
         enrollment_start=further_past_date,
         start_date=future_date + timedelta(days=2),
         enrollment_end=further_future_date + timedelta(days=2),
-        end_date=furthest_future_date + timedelta(days=2)
+        end_date=furthest_future_date + timedelta(days=2),
     )
 
     # A self-paced course that is open for enrollment