fix: update course listing authorization tests

Author: BryanttV

cms/djangoapps/contentstore/tests/test_course_listing.py

@@ -839,7 +839,7 @@ def test_course_listing_with_platform_scope(self):
         Verify that a platform-wide scope (`course-v1:*`) grants access to all
         courses across orgs when the AuthZ course authoring toggle is enabled.
         """
-        _, _, authz_courses, _ = self._create_courses()
+        _, _, authz_courses, legacy_courses = self._create_courses()
         org2_course_key = CourseLocator("Org2", "Course1", "AuthzRun")
         org2_course = self._create_course(org2_course_key)
         assign_role_to_user_in_scope(
@@ -850,11 +850,19 @@ def test_course_listing_with_platform_scope(self):
 
         request = self._make_request(self.authorized_user)
 
-        with self._authz_waffle_context(active=True):
+        with patch.object(
+            core_toggles.AUTHZ_COURSE_AUTHORING_FLAG,
+            "is_enabled",
+            return_value=True,
+        ):
             courses, _ = get_courses_accessible_to_user(request)
 
             result_ids = {c.id for c in courses}
-            expected_ids = {*(c.id for c in authz_courses), org2_course.id}
+            expected_ids = {
+                *(c.id for c in authz_courses),
+                *(c.id for c in legacy_courses),
+                org2_course.id
+            }
 
             self.assertEqual(result_ids, expected_ids)  # noqa: PT009
 
@@ -890,19 +898,17 @@ def test_get_course_keys_from_scopes_with_platform_scope(self):
         """
         Platform-wide scopes should resolve to all courses with AuthZ enabled.
         """
-        authz_keys, _, _, _ = self._create_courses()
-        org2_course_key = CourseLocator("Org2", "Course1", "AuthzRun")
-        self._create_course(org2_course_key)
-        enabled_keys = {str(key) for key in authz_keys}
+        authz_keys, legacy_keys, _, _ = self._create_courses()
+        enabled_keys = {str(key) for key in authz_keys + legacy_keys}
 
         with patch.object(
             core_toggles.AUTHZ_COURSE_AUTHORING_FLAG,
             "is_enabled",
             side_effect=self._mock_authz_toggle(enabled_keys),
         ):
-            course_keys = _get_course_keys_from_scopes([PlatformCourseOverviewGlobData.build_external_key()])
+            course_keys = _get_course_keys_from_scopes([PlatformCourseOverviewGlobData(external_key="course-v1:*")])
 
-        self.assertEqual(course_keys, set(authz_keys))  # noqa: PT009
+        self.assertEqual(course_keys, set(authz_keys) | set(legacy_keys))  # noqa: PT009
 
     def test_get_course_keys_from_scopes_platform_scope_short_circuits(self):
         """
@@ -918,8 +924,8 @@ def test_get_course_keys_from_scopes_platform_scope_short_circuits(self):
         ):
             course_keys = _get_course_keys_from_scopes(
                 [
-                    OrgCourseOverviewGlobData.build_external_key("Org1"),
-                    PlatformCourseOverviewGlobData.build_external_key(),
+                    OrgCourseOverviewGlobData(external_key="course-v1:Org1+*"),
+                    PlatformCourseOverviewGlobData(external_key="course-v1:*"),
                 ]
             )