squash!: Fix conflicts

Author: rodmgwgu

openedx_authz/tests/rest_api/test_views.py

@@ -25,7 +25,7 @@
 from openedx_authz.models.scopes import get_content_library_model, get_course_overview_model
 from openedx_authz.rest_api.data import RoleOperationError, RoleOperationStatus
 from openedx_authz.rest_api.v1.permissions import AnyScopePermission, DynamicScopePermission
-from openedx_authz.rest_api.v1.views import UserValidationAPIView
+from openedx_authz.rest_api.v1.views import ScopesAPIView, UserValidationAPIView
 from openedx_authz.tests.api.test_roles import BaseRolesTestCase
 from openedx_authz.tests.stubs.models import LearningPackage
 
@@ -966,7 +966,7 @@ def setUp(self):
 
         # Patch _build_queryset so tests don't need real DB querysets.
         self.build_qs_patcher = patch.object(
-            views.ScopesAPIView,
+            ScopesAPIView,
             "_build_queryset",
             return_value=self.fake_scopes,
         )
@@ -1029,9 +1029,9 @@ def test_type_param_calls_only_expected_queryset(self, scope_type, called_method
         """When type=course only courses are fetched; when type=library only libraries."""
         self.build_qs_patcher.stop()
         with (
-            patch.object(views.ScopesAPIView, called_method, return_value=[]) as mock_called,
-            patch.object(views.ScopesAPIView, skipped_method) as mock_skipped,
-            patch.object(views.ScopesAPIView, "_build_queryset", return_value=[]),
+            patch.object(ScopesAPIView, called_method, return_value=[]) as mock_called,
+            patch.object(ScopesAPIView, skipped_method) as mock_skipped,
+            patch.object(ScopesAPIView, "_build_queryset", return_value=[]),
         ):
             response = self.client.get(self.url, {"scope_type": scope_type})
         self.build_qs_patcher.start()
@@ -1050,9 +1050,9 @@ def test_type_param_absent_returns_both(self):
         """When type is not specified, both courses and libraries are returned."""
         self.build_qs_patcher.stop()
         with (
-            patch.object(views.ScopesAPIView, "_get_courses_queryset", return_value=[]) as mock_courses,
-            patch.object(views.ScopesAPIView, "_get_libraries_queryset", return_value=[]) as mock_libraries,
-            patch.object(views.ScopesAPIView, "_build_queryset", return_value=[]),
+            patch.object(ScopesAPIView, "_get_courses_queryset", return_value=[]) as mock_courses,
+            patch.object(ScopesAPIView, "_get_libraries_queryset", return_value=[]) as mock_libraries,
+            patch.object(ScopesAPIView, "_build_queryset", return_value=[]),
         ):
             response = self.client.get(self.url)
         self.build_qs_patcher.start()
@@ -1102,7 +1102,7 @@ def test_pagination(self, query_params: dict, expected_page_count: int, has_next
             {"scope_id": self.COURSE_ORG2, "display_name_col": "Course 2", "org_name": "Org2", "scope_type": "course"},
         ]
         self.build_qs_patcher.stop()
-        with patch.object(views.ScopesAPIView, "_build_queryset", return_value=mixed):
+        with patch.object(ScopesAPIView, "_build_queryset", return_value=mixed):
             response = self.client.get(self.url, query_params)
         self.build_qs_patcher.start()