diff --git a/cms/djangoapps/contentstore/api/tests/base.py b/cms/djangoapps/contentstore/api/tests/base.py index 10dc8bce64..8ca28edd4f 100644 --- a/cms/djangoapps/contentstore/api/tests/base.py +++ b/cms/djangoapps/contentstore/api/tests/base.py @@ -6,8 +6,8 @@ Base test case for the course API views. from django.urls import reverse from rest_framework.test import APITestCase +from common.djangoapps.student.tests.factories import StaffFactory from common.djangoapps.student.tests.factories import UserFactory -from lms.djangoapps.courseware.tests.factories import StaffFactory from xmodule.modulestore.tests.django_utils import TEST_DATA_SPLIT_MODULESTORE, SharedModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory diff --git a/cms/djangoapps/contentstore/api/tests/test_import.py b/cms/djangoapps/contentstore/api/tests/test_import.py index a7a8246868..c8d21d8ee0 100644 --- a/cms/djangoapps/contentstore/api/tests/test_import.py +++ b/cms/djangoapps/contentstore/api/tests/test_import.py @@ -13,8 +13,8 @@ from rest_framework import status from rest_framework.test import APITestCase from user_tasks.models import UserTaskStatus +from common.djangoapps.student.tests.factories import StaffFactory from common.djangoapps.student.tests.factories import UserFactory -from lms.djangoapps.courseware.tests.factories import StaffFactory from xmodule.modulestore.tests.django_utils import TEST_DATA_SPLIT_MODULESTORE, SharedModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory diff --git a/cms/djangoapps/contentstore/api/tests/test_validation.py b/cms/djangoapps/contentstore/api/tests/test_validation.py index a269eb2a59..7b4e29c7a4 100644 --- a/cms/djangoapps/contentstore/api/tests/test_validation.py +++ b/cms/djangoapps/contentstore/api/tests/test_validation.py @@ -9,8 +9,8 @@ from django.urls import reverse from rest_framework import status from rest_framework.test import APITestCase +from common.djangoapps.student.tests.factories import StaffFactory from common.djangoapps.student.tests.factories import UserFactory -from lms.djangoapps.courseware.tests.factories import StaffFactory from xmodule.modulestore.tests.django_utils import TEST_DATA_SPLIT_MODULESTORE, SharedModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory diff --git a/common/djangoapps/student/tests/factories.py b/common/djangoapps/student/tests/factories.py index fa0e165030..3a2d7b7d47 100644 --- a/common/djangoapps/student/tests/factories.py +++ b/common/djangoapps/student/tests/factories.py @@ -26,6 +26,7 @@ from common.djangoapps.student.models import ( UserStanding ) from common.djangoapps.student.roles import GlobalStaff +from common.djangoapps.student.roles import CourseStaffRole # Factories are self documenting @@ -239,4 +240,17 @@ class GlobalStaffFactory(UserFactory): @factory.post_generation def set_staff(self, _create, _extracted, **kwargs): GlobalStaff().add_users(self) -# pylint: enable=unused-argument + + +class StaffFactory(UserFactory): + """ + Given a course Location, returns a User object with staff + permissions for `course`. + """ + last_name = 'Staff' + + @factory.post_generation + def course_key(self, _create, extracted, **kwargs): + if extracted is None: + raise ValueError('Must specify a CourseKey for a course staff user') + CourseStaffRole(extracted).add_users(self) diff --git a/common/djangoapps/student/tests/test_roles.py b/common/djangoapps/student/tests/test_roles.py index 059abcf2e8..f900844a72 100644 --- a/common/djangoapps/student/tests/test_roles.py +++ b/common/djangoapps/student/tests/test_roles.py @@ -8,7 +8,7 @@ import six from django.test import TestCase from opaque_keys.edx.keys import CourseKey -from lms.djangoapps.courseware.tests.factories import InstructorFactory, StaffFactory, UserFactory +from lms.djangoapps.courseware.tests.factories import InstructorFactory, UserFactory from common.djangoapps.student.roles import ( CourseBetaTesterRole, CourseInstructorRole, @@ -20,6 +20,7 @@ from common.djangoapps.student.roles import ( RoleCache ) from common.djangoapps.student.tests.factories import AnonymousUserFactory +from common.djangoapps.student.tests.factories import StaffFactory class RolesTestCase(TestCase): diff --git a/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py b/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py index 3f7729b4b1..c7d3685353 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py @@ -16,12 +16,12 @@ from django.db import connections from django.test import TestCase from django.test.utils import override_settings -from lms.djangoapps.courseware.tests.factories import StaffFactory from lms.djangoapps.courseware.field_overrides import OverrideFieldData from openedx.core.djangolib.testing.utils import CacheIsolationMixin, CacheIsolationTestCase, FilteredQueryCountMixin from openedx.core.lib.tempdir import mkdtemp_clean from common.djangoapps.student.models import CourseEnrollment from common.djangoapps.student.tests.factories import AdminFactory, UserFactory +from common.djangoapps.student.tests.factories import StaffFactory from xmodule.contentstore.django import _CONTENTSTORE from xmodule.modulestore import ModuleStoreEnum from xmodule.modulestore.django import SignalHandler, clear_existing_modulestores, modulestore diff --git a/lms/djangoapps/bulk_email/tests/test_email.py b/lms/djangoapps/bulk_email/tests/test_email.py index e24b092165..74d501e0cc 100644 --- a/lms/djangoapps/bulk_email/tests/test_email.py +++ b/lms/djangoapps/bulk_email/tests/test_email.py @@ -22,8 +22,9 @@ from common.djangoapps.course_modes.models import CourseMode from common.djangoapps.student.models import CourseEnrollment from common.djangoapps.student.roles import CourseStaffRole from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory +from common.djangoapps.student.tests.factories import StaffFactory from lms.djangoapps.bulk_email.tasks import _get_course_email_context, _get_source_address -from lms.djangoapps.courseware.tests.factories import InstructorFactory, StaffFactory +from lms.djangoapps.courseware.tests.factories import InstructorFactory from lms.djangoapps.instructor_task.subtasks import update_subtask_status from openedx.core.djangoapps.course_groups.cohorts import add_user_to_cohort from openedx.core.djangoapps.course_groups.models import CourseCohort diff --git a/lms/djangoapps/course_wiki/tests/test_access.py b/lms/djangoapps/course_wiki/tests/test_access.py index 6647fe158d..2e8cda083d 100644 --- a/lms/djangoapps/course_wiki/tests/test_access.py +++ b/lms/djangoapps/course_wiki/tests/test_access.py @@ -6,10 +6,11 @@ Tests for wiki permissions from django.contrib.auth.models import Group from wiki.models import URLPath +from common.djangoapps.student.tests.factories import StaffFactory from lms.djangoapps.course_wiki import settings from lms.djangoapps.course_wiki.utils import course_wiki_slug, user_is_article_course_staff from lms.djangoapps.course_wiki.views import get_or_create_root -from lms.djangoapps.courseware.tests.factories import InstructorFactory, StaffFactory +from lms.djangoapps.courseware.tests.factories import InstructorFactory from common.djangoapps.student.tests.factories import UserFactory from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory diff --git a/lms/djangoapps/courseware/tests/factories.py b/lms/djangoapps/courseware/tests/factories.py index 1477536e56..378942cdf6 100644 --- a/lms/djangoapps/courseware/tests/factories.py +++ b/lms/djangoapps/courseware/tests/factories.py @@ -19,7 +19,6 @@ from lms.djangoapps.courseware.models import ( from common.djangoapps.student.roles import ( CourseBetaTesterRole, CourseInstructorRole, - CourseStaffRole, OrgInstructorRole, OrgStaffRole ) @@ -56,20 +55,6 @@ class InstructorFactory(UserFactory): CourseInstructorRole(extracted).add_users(self) -class StaffFactory(UserFactory): - """ - Given a course Location, returns a User object with staff - permissions for `course`. - """ - last_name = "Staff" - - @factory.post_generation - def course_key(self, create, extracted, **kwargs): - if extracted is None: - raise ValueError("Must specify a CourseKey for a course staff user") - CourseStaffRole(extracted).add_users(self) - - class BetaTesterFactory(UserFactory): """ Given a course Location, returns a User object with beta-tester diff --git a/lms/djangoapps/courseware/tests/test_access.py b/lms/djangoapps/courseware/tests/test_access.py index e49a16ae7a..25b8ae87bb 100644 --- a/lms/djangoapps/courseware/tests/test_access.py +++ b/lms/djangoapps/courseware/tests/test_access.py @@ -25,7 +25,6 @@ from lms.djangoapps.courseware.masquerade import CourseMasquerade from lms.djangoapps.courseware.tests.factories import ( BetaTesterFactory, InstructorFactory, - StaffFactory, UserFactory ) from lms.djangoapps.courseware.tests.helpers import LoginEnrollmentTestCase, masquerade_as_group_member @@ -42,6 +41,7 @@ from common.djangoapps.student.tests.factories import ( CourseEnrollmentFactory ) from common.djangoapps.student.tests.factories import GlobalStaffFactory +from common.djangoapps.student.tests.factories import StaffFactory from common.djangoapps.util.milestones_helpers import fulfill_course_milestone, set_prerequisite_courses from xmodule.course_module import ( CATALOG_VISIBILITY_ABOUT, diff --git a/lms/djangoapps/courseware/tests/test_entrance_exam.py b/lms/djangoapps/courseware/tests/test_entrance_exam.py index c52112c221..807f2cdd53 100644 --- a/lms/djangoapps/courseware/tests/test_entrance_exam.py +++ b/lms/djangoapps/courseware/tests/test_entrance_exam.py @@ -18,12 +18,13 @@ from lms.djangoapps.courseware.entrance_exams import ( ) from lms.djangoapps.courseware.model_data import FieldDataCache from lms.djangoapps.courseware.module_render import get_module, handle_xblock_callback, toc_for_course -from lms.djangoapps.courseware.tests.factories import InstructorFactory, RequestFactoryNoCsrf, StaffFactory, UserFactory +from lms.djangoapps.courseware.tests.factories import InstructorFactory, RequestFactoryNoCsrf, UserFactory from lms.djangoapps.courseware.tests.helpers import LoginEnrollmentTestCase from openedx.core.djangolib.testing.utils import get_mock_request from openedx.features.course_experience import DISABLE_COURSE_OUTLINE_PAGE_FLAG, DISABLE_UNIFIED_COURSE_TAB_FLAG from common.djangoapps.student.models import CourseEnrollment from common.djangoapps.student.tests.factories import AnonymousUserFactory, CourseEnrollmentFactory +from common.djangoapps.student.tests.factories import StaffFactory from common.djangoapps.util.milestones_helpers import ( add_course_content_milestone, add_course_milestone, diff --git a/lms/djangoapps/courseware/tests/test_group_access.py b/lms/djangoapps/courseware/tests/test_group_access.py index 5aa4fe18e1..3d1a234a18 100644 --- a/lms/djangoapps/courseware/tests/test_group_access.py +++ b/lms/djangoapps/courseware/tests/test_group_access.py @@ -7,8 +7,9 @@ access control rules. import ddt from stevedore.extension import Extension, ExtensionManager +from common.djangoapps.student.tests.factories import StaffFactory import lms.djangoapps.courseware.access as access -from lms.djangoapps.courseware.tests.factories import StaffFactory, UserFactory +from lms.djangoapps.courseware.tests.factories import UserFactory from xmodule.modulestore.django import modulestore from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory diff --git a/lms/djangoapps/courseware/tests/test_masquerade.py b/lms/djangoapps/courseware/tests/test_masquerade.py index 489fe254ef..06ae1151fb 100644 --- a/lms/djangoapps/courseware/tests/test_masquerade.py +++ b/lms/djangoapps/courseware/tests/test_masquerade.py @@ -25,7 +25,6 @@ from lms.djangoapps.courseware.masquerade import ( get_masquerading_user_group, setup_masquerade, ) -from lms.djangoapps.courseware.tests.factories import StaffFactory from lms.djangoapps.courseware.tests.helpers import LoginEnrollmentTestCase, MasqueradeMixin, masquerade_as_group_member from lms.djangoapps.courseware.tests.test_submitting_problems import ProblemSubmissionTestMixin from openedx.core.djangoapps.lang_pref import LANGUAGE_KEY @@ -33,6 +32,7 @@ from openedx.core.djangoapps.self_paced.models import SelfPacedConfiguration from openedx.core.djangoapps.user_api.preferences.api import get_user_preference, set_user_preference from openedx.features.course_experience import DISABLE_UNIFIED_COURSE_TAB_FLAG from common.djangoapps.student.models import CourseEnrollment +from common.djangoapps.student.tests.factories import StaffFactory from common.djangoapps.student.tests.factories import UserFactory from xmodule.modulestore.django import modulestore from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase diff --git a/lms/djangoapps/courseware/tests/test_tabs.py b/lms/djangoapps/courseware/tests/test_tabs.py index 58490fdd39..58951700bc 100644 --- a/lms/djangoapps/courseware/tests/test_tabs.py +++ b/lms/djangoapps/courseware/tests/test_tabs.py @@ -20,13 +20,14 @@ from lms.djangoapps.courseware.tabs import ( ProgressTab, get_course_tab_list ) -from lms.djangoapps.courseware.tests.factories import InstructorFactory, StaffFactory +from lms.djangoapps.courseware.tests.factories import InstructorFactory from lms.djangoapps.courseware.tests.helpers import LoginEnrollmentTestCase from lms.djangoapps.courseware.views.views import StaticCourseTabView, get_static_tab_fragment from openedx.core.djangolib.testing.utils import get_mock_request from openedx.core.lib.courses import get_course_by_id from openedx.features.course_experience import DISABLE_UNIFIED_COURSE_TAB_FLAG from common.djangoapps.student.models import CourseEnrollment +from common.djangoapps.student.tests.factories import StaffFactory from common.djangoapps.student.tests.factories import UserFactory from common.djangoapps.util.milestones_helpers import ( add_course_content_milestone, diff --git a/lms/djangoapps/courseware/tests/test_view_authentication.py b/lms/djangoapps/courseware/tests/test_view_authentication.py index b16bd2a72c..5a3ea362ff 100644 --- a/lms/djangoapps/courseware/tests/test_view_authentication.py +++ b/lms/djangoapps/courseware/tests/test_view_authentication.py @@ -10,13 +10,13 @@ import pytz from django.urls import reverse from common.djangoapps.student.tests.factories import GlobalStaffFactory +from common.djangoapps.student.tests.factories import StaffFactory from lms.djangoapps.courseware.access import has_access from lms.djangoapps.courseware.tests.factories import ( BetaTesterFactory, InstructorFactory, OrgInstructorFactory, OrgStaffFactory, - StaffFactory ) from lms.djangoapps.courseware.tests.helpers import CourseAccessTestMixin, LoginEnrollmentTestCase from openedx.features.enterprise_support.tests.mixins.enterprise import EnterpriseTestConsentRequired diff --git a/lms/djangoapps/discussion/rest_api/tests/test_api.py b/lms/djangoapps/discussion/rest_api/tests/test_api.py index be4dbf762a..35b2b75fcc 100644 --- a/lms/djangoapps/discussion/rest_api/tests/test_api.py +++ b/lms/djangoapps/discussion/rest_api/tests/test_api.py @@ -18,9 +18,10 @@ from rest_framework.exceptions import PermissionDenied from six.moves.urllib.parse import parse_qs, urlencode, urlparse, urlunparse from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory +from common.djangoapps.student.tests.factories import StaffFactory from common.djangoapps.util.testing import UrlResetMixin from common.test.utils import MockSignalHandlerMixin, disable_signal -from lms.djangoapps.courseware.tests.factories import BetaTesterFactory, StaffFactory +from lms.djangoapps.courseware.tests.factories import BetaTesterFactory from lms.djangoapps.discussion.django_comment_client.tests.utils import ForumsEnableMixin from lms.djangoapps.discussion.rest_api import api from lms.djangoapps.discussion.rest_api.api import ( diff --git a/lms/djangoapps/grades/rest_api/v1/tests/test_gradebook_views.py b/lms/djangoapps/grades/rest_api/v1/tests/test_gradebook_views.py index 0983107e98..9e10b208dc 100644 --- a/lms/djangoapps/grades/rest_api/v1/tests/test_gradebook_views.py +++ b/lms/djangoapps/grades/rest_api/v1/tests/test_gradebook_views.py @@ -28,8 +28,9 @@ from common.djangoapps.student.roles import ( CourseStaffRole ) from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory +from common.djangoapps.student.tests.factories import StaffFactory from lms.djangoapps.certificates.models import CertificateStatuses, GeneratedCertificate -from lms.djangoapps.courseware.tests.factories import InstructorFactory, StaffFactory +from lms.djangoapps.courseware.tests.factories import InstructorFactory from lms.djangoapps.grades.config.waffle import WRITABLE_GRADEBOOK, waffle_flags from lms.djangoapps.grades.constants import GradeOverrideFeatureEnum from lms.djangoapps.grades.course_data import CourseData diff --git a/lms/djangoapps/grades/rest_api/v1/tests/test_grading_policy_view.py b/lms/djangoapps/grades/rest_api/v1/tests/test_grading_policy_view.py index 195486b3b1..bcd045e2fa 100644 --- a/lms/djangoapps/grades/rest_api/v1/tests/test_grading_policy_view.py +++ b/lms/djangoapps/grades/rest_api/v1/tests/test_grading_policy_view.py @@ -11,8 +11,8 @@ from pytz import UTC from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory from common.djangoapps.student.tests.factories import GlobalStaffFactory +from common.djangoapps.student.tests.factories import StaffFactory from common.djangoapps.student.tests.factories import UserFactory -from lms.djangoapps.courseware.tests.factories import StaffFactory from openedx.core.djangoapps.oauth_dispatch.tests.factories import AccessTokenFactory, ApplicationFactory from xmodule.modulestore import ModuleStoreEnum from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase diff --git a/lms/djangoapps/instructor/tests/test_api.py b/lms/djangoapps/instructor/tests/test_api.py index 6d9712bc85..adad7a705b 100644 --- a/lms/djangoapps/instructor/tests/test_api.py +++ b/lms/djangoapps/instructor/tests/test_api.py @@ -54,6 +54,7 @@ from common.djangoapps.student.roles import ( ) from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory from common.djangoapps.student.tests.factories import GlobalStaffFactory +from common.djangoapps.student.tests.factories import StaffFactory from lms.djangoapps.bulk_email.models import BulkEmailFlag, CourseEmail, CourseEmailTemplate from lms.djangoapps.certificates.api import generate_user_certificates from lms.djangoapps.certificates.models import CertificateStatuses @@ -64,7 +65,6 @@ from lms.djangoapps.courseware.models import StudentModule from lms.djangoapps.courseware.tests.factories import ( BetaTesterFactory, InstructorFactory, - StaffFactory, ) from lms.djangoapps.courseware.tests.helpers import LoginEnrollmentTestCase from lms.djangoapps.instructor.tests.utils import FakeContentTask, FakeEmail, FakeEmailInfo diff --git a/lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py b/lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py index fa1477d722..730f61e1c0 100644 --- a/lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py +++ b/lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py @@ -21,9 +21,10 @@ from common.djangoapps.edxmako.shortcuts import render_to_response from common.djangoapps.student.models import CourseEnrollment from common.djangoapps.student.roles import CourseFinanceAdminRole # lint-amnesty, pylint: disable=unused-import from common.djangoapps.student.tests.factories import AdminFactory, CourseAccessRoleFactory, CourseEnrollmentFactory +from common.djangoapps.student.tests.factories import StaffFactory from common.test.utils import XssTestMixin from lms.djangoapps.courseware.tabs import get_course_tab_list -from lms.djangoapps.courseware.tests.factories import StaffFactory, StudentModuleFactory, UserFactory +from lms.djangoapps.courseware.tests.factories import StudentModuleFactory, UserFactory from lms.djangoapps.courseware.tests.helpers import LoginEnrollmentTestCase from lms.djangoapps.grades.config.waffle import WRITABLE_GRADEBOOK, waffle_flags from lms.djangoapps.instructor.toggles import DATA_DOWNLOAD_V2 diff --git a/lms/djangoapps/teams/tests/test_views.py b/lms/djangoapps/teams/tests/test_views.py index cf451bbb97..b306e1d1f2 100644 --- a/lms/djangoapps/teams/tests/test_views.py +++ b/lms/djangoapps/teams/tests/test_views.py @@ -24,9 +24,9 @@ from search.search_engine_base import SearchEngine from common.djangoapps.course_modes.models import CourseMode from common.djangoapps.student.models import CourseEnrollment from common.djangoapps.student.tests.factories import AdminFactory, CourseEnrollmentFactory, UserFactory +from common.djangoapps.student.tests.factories import StaffFactory from common.djangoapps.util.testing import EventTestMixin from common.test.utils import skip_signal -from lms.djangoapps.courseware.tests.factories import StaffFactory from lms.djangoapps.program_enrollments.tests.factories import ProgramEnrollmentFactory from openedx.core.djangoapps.django_comment_common.models import FORUM_ROLE_COMMUNITY_TA, Role from openedx.core.djangoapps.django_comment_common.utils import seed_permissions_roles diff --git a/openedx/core/djangoapps/course_groups/tests/test_views.py b/openedx/core/djangoapps/course_groups/tests/test_views.py index 08f5c7afdb..a115d87805 100644 --- a/openedx/core/djangoapps/course_groups/tests/test_views.py +++ b/openedx/core/djangoapps/course_groups/tests/test_views.py @@ -15,8 +15,9 @@ from opaque_keys.edx.locator import CourseLocator from openedx.core.djangoapps.django_comment_common.models import CourseDiscussionSettings from openedx.core.djangoapps.django_comment_common.utils import get_course_discussion_settings -from lms.djangoapps.courseware.tests.factories import InstructorFactory, StaffFactory +from lms.djangoapps.courseware.tests.factories import InstructorFactory from common.djangoapps.student.models import CourseEnrollment +from common.djangoapps.student.tests.factories import StaffFactory from common.djangoapps.student.tests.factories import UserFactory from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory diff --git a/openedx/core/djangoapps/discussions/tests/test_views.py b/openedx/core/djangoapps/discussions/tests/test_views.py index d3dcb9c499..75dc57da74 100644 --- a/openedx/core/djangoapps/discussions/tests/test_views.py +++ b/openedx/core/djangoapps/discussions/tests/test_views.py @@ -11,8 +11,8 @@ from rest_framework import status from rest_framework.test import APITestCase from common.djangoapps.student.tests.factories import GlobalStaffFactory +from common.djangoapps.student.tests.factories import StaffFactory from common.djangoapps.student.tests.factories import UserFactory -from lms.djangoapps.courseware.tests.factories import StaffFactory @unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'URLs are only configured in LMS') diff --git a/openedx/features/content_type_gating/tests/test_access.py b/openedx/features/content_type_gating/tests/test_access.py index ad4a68b0b5..8b7f795e01 100644 --- a/openedx/features/content_type_gating/tests/test_access.py +++ b/openedx/features/content_type_gating/tests/test_access.py @@ -17,13 +17,13 @@ from pyquery import PyQuery as pq from lms.djangoapps.course_api.blocks.api import get_blocks from common.djangoapps.course_modes.tests.factories import CourseModeFactory from common.djangoapps.student.tests.factories import GlobalStaffFactory +from common.djangoapps.student.tests.factories import StaffFactory from lms.djangoapps.courseware.module_render import load_single_xblock from lms.djangoapps.courseware.tests.factories import ( BetaTesterFactory, InstructorFactory, OrgInstructorFactory, OrgStaffFactory, - StaffFactory ) from lms.djangoapps.courseware.tests.helpers import MasqueradeMixin from lms.djangoapps.discussion.django_comment_client.tests.factories import RoleFactory diff --git a/openedx/features/course_duration_limits/tests/test_course_expiration.py b/openedx/features/course_duration_limits/tests/test_course_expiration.py index 127a122792..4b2daea7f4 100644 --- a/openedx/features/course_duration_limits/tests/test_course_expiration.py +++ b/openedx/features/course_duration_limits/tests/test_course_expiration.py @@ -15,12 +15,12 @@ from common.djangoapps.student.models import CourseEnrollment, FBEEnrollmentExcl from common.djangoapps.student.roles import CourseInstructorRole from common.djangoapps.student.tests.factories import TEST_PASSWORD, CourseEnrollmentFactory, UserFactory from common.djangoapps.student.tests.factories import GlobalStaffFactory +from common.djangoapps.student.tests.factories import StaffFactory from lms.djangoapps.courseware.tests.factories import ( BetaTesterFactory, InstructorFactory, OrgInstructorFactory, OrgStaffFactory, - StaffFactory ) from lms.djangoapps.courseware.tests.helpers import MasqueradeMixin from lms.djangoapps.discussion.django_comment_client.tests.factories import RoleFactory diff --git a/openedx/features/course_experience/tests/views/test_course_home.py b/openedx/features/course_experience/tests/views/test_course_home.py index 283144c738..8f007273ee 100644 --- a/openedx/features/course_experience/tests/views/test_course_home.py +++ b/openedx/features/course_experience/tests/views/test_course_home.py @@ -22,6 +22,7 @@ from waffle.testutils import override_flag from common.djangoapps.course_modes.models import CourseMode from common.djangoapps.course_modes.tests.factories import CourseModeFactory from common.djangoapps.student.tests.factories import GlobalStaffFactory +from common.djangoapps.student.tests.factories import StaffFactory from common.djangoapps.util.date_utils import strftime_localized_html from lms.djangoapps.experiments.models import ExperimentData from lms.djangoapps.commerce.models import CommerceConfiguration @@ -32,7 +33,6 @@ from lms.djangoapps.courseware.tests.factories import ( InstructorFactory, OrgInstructorFactory, OrgStaffFactory, - StaffFactory ) from lms.djangoapps.courseware.tests.helpers import get_expiration_banner_text from lms.djangoapps.courseware.utils import verified_upgrade_deadline_link diff --git a/openedx/features/course_experience/tests/views/test_course_outline.py b/openedx/features/course_experience/tests/views/test_course_outline.py index 1b8e080e86..b42299e532 100644 --- a/openedx/features/course_experience/tests/views/test_course_outline.py +++ b/openedx/features/course_experience/tests/views/test_course_outline.py @@ -26,9 +26,9 @@ from waffle.models import Switch from common.djangoapps.course_modes.models import CourseMode from common.djangoapps.course_modes.tests.factories import CourseModeFactory +from common.djangoapps.student.tests.factories import StaffFactory from lms.djangoapps.course_api.blocks.transformers.milestones import MilestonesAndSpecialExamsTransformer from lms.djangoapps.gating import api as lms_gating_api -from lms.djangoapps.courseware.tests.factories import StaffFactory from lms.djangoapps.courseware.tests.helpers import MasqueradeMixin from lms.urls import RESET_COURSE_DEADLINES_NAME from openedx.core.djangoapps.course_date_signals.models import SelfPacedRelativeDatesConfig