From 22fb1ec124a8a9e9f7fb3de770fea7e2757d55da Mon Sep 17 00:00:00 2001 From: stvn Date: Tue, 13 Apr 2021 18:54:54 -0700 Subject: [PATCH] refactor: Move InstructorFactory helper to common/ --- .../contentstore/rest_api/v1/tests/test_views.py | 2 +- common/djangoapps/student/tests/factories.py | 15 +++++++++++++++ common/djangoapps/student/tests/test_roles.py | 2 +- lms/djangoapps/bulk_email/tests/test_email.py | 2 +- lms/djangoapps/course_wiki/tests/test_access.py | 2 +- .../tests/test_comprehensive_theming.py | 2 +- .../course_wiki/tests/test_middleware.py | 2 +- lms/djangoapps/courseware/tests/factories.py | 15 --------------- lms/djangoapps/courseware/tests/test_access.py | 2 +- .../courseware/tests/test_entrance_exam.py | 3 ++- lms/djangoapps/courseware/tests/test_tabs.py | 2 +- .../courseware/tests/test_view_authentication.py | 2 +- .../django_comment_client/tests/test_utils.py | 2 +- .../rest_api/v1/tests/test_gradebook_views.py | 2 +- lms/djangoapps/instructor/tests/test_api.py | 2 +- .../tests/test_api_email_localization.py | 2 +- .../instructor/tests/test_certificates.py | 2 +- .../instructor_analytics/tests/test_basic.py | 2 +- .../rest_api/v1/tests/test_views.py | 2 +- .../djangoapps/course_groups/tests/test_views.py | 2 +- .../content_type_gating/tests/test_access.py | 2 +- .../tests/test_course_expiration.py | 2 +- .../tests/views/test_course_home.py | 2 +- 23 files changed, 37 insertions(+), 36 deletions(-) diff --git a/cms/djangoapps/contentstore/rest_api/v1/tests/test_views.py b/cms/djangoapps/contentstore/rest_api/v1/tests/test_views.py index 751d09799d..55a96ba4dc 100644 --- a/cms/djangoapps/contentstore/rest_api/v1/tests/test_views.py +++ b/cms/djangoapps/contentstore/rest_api/v1/tests/test_views.py @@ -9,8 +9,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 InstructorFactory from common.djangoapps.student.tests.factories import UserFactory -from lms.djangoapps.courseware.tests.factories import InstructorFactory from xmodule.modulestore.django import modulestore from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory diff --git a/common/djangoapps/student/tests/factories.py b/common/djangoapps/student/tests/factories.py index 3a2d7b7d47..01fb1c74f8 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 CourseInstructorRole from common.djangoapps.student.roles import CourseStaffRole # Factories are self documenting @@ -242,6 +243,20 @@ class GlobalStaffFactory(UserFactory): GlobalStaff().add_users(self) +class InstructorFactory(UserFactory): + """ + Given a course Location, returns a User object with instructor + permissions for `course`. + """ + last_name = 'Instructor' + + @factory.post_generation + def course_key(self, _create, extracted, **kwargs): + if extracted is None: + raise ValueError('Must specify a CourseKey for a course instructor user') + CourseInstructorRole(extracted).add_users(self) + + class StaffFactory(UserFactory): """ Given a course Location, returns a User object with staff diff --git a/common/djangoapps/student/tests/test_roles.py b/common/djangoapps/student/tests/test_roles.py index a79a6d4b63..520c6699c9 100644 --- a/common/djangoapps/student/tests/test_roles.py +++ b/common/djangoapps/student/tests/test_roles.py @@ -8,7 +8,6 @@ import six from django.test import TestCase from opaque_keys.edx.keys import CourseKey -from lms.djangoapps.courseware.tests.factories import InstructorFactory from common.djangoapps.student.roles import ( CourseBetaTesterRole, CourseInstructorRole, @@ -20,6 +19,7 @@ from common.djangoapps.student.roles import ( RoleCache ) from common.djangoapps.student.tests.factories import AnonymousUserFactory +from common.djangoapps.student.tests.factories import InstructorFactory from common.djangoapps.student.tests.factories import StaffFactory from common.djangoapps.student.tests.factories import UserFactory diff --git a/lms/djangoapps/bulk_email/tests/test_email.py b/lms/djangoapps/bulk_email/tests/test_email.py index 74d501e0cc..c7c320e77f 100644 --- a/lms/djangoapps/bulk_email/tests/test_email.py +++ b/lms/djangoapps/bulk_email/tests/test_email.py @@ -22,9 +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 InstructorFactory 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 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 2e8cda083d..ce649505bd 100644 --- a/lms/djangoapps/course_wiki/tests/test_access.py +++ b/lms/djangoapps/course_wiki/tests/test_access.py @@ -6,11 +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 InstructorFactory 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 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/course_wiki/tests/test_comprehensive_theming.py b/lms/djangoapps/course_wiki/tests/test_comprehensive_theming.py index a6e95a18d9..fb87cee1ae 100644 --- a/lms/djangoapps/course_wiki/tests/test_comprehensive_theming.py +++ b/lms/djangoapps/course_wiki/tests/test_comprehensive_theming.py @@ -8,8 +8,8 @@ from unittest import skip from django.test.client import Client from wiki.models import URLPath +from common.djangoapps.student.tests.factories import InstructorFactory from lms.djangoapps.course_wiki.views import get_or_create_root -from lms.djangoapps.courseware.tests.factories import InstructorFactory from openedx.core.djangoapps.theming.tests.test_util import with_comprehensive_theme from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory diff --git a/lms/djangoapps/course_wiki/tests/test_middleware.py b/lms/djangoapps/course_wiki/tests/test_middleware.py index c42ac316db..b4ce9c0f3d 100644 --- a/lms/djangoapps/course_wiki/tests/test_middleware.py +++ b/lms/djangoapps/course_wiki/tests/test_middleware.py @@ -6,8 +6,8 @@ Tests for wiki middleware. from django.test.client import Client from wiki.models import URLPath +from common.djangoapps.student.tests.factories import InstructorFactory from lms.djangoapps.course_wiki.views import get_or_create_root -from lms.djangoapps.courseware.tests.factories import InstructorFactory 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 a5c137492b..c9dd4b5d1f 100644 --- a/lms/djangoapps/courseware/tests/factories.py +++ b/lms/djangoapps/courseware/tests/factories.py @@ -18,7 +18,6 @@ from lms.djangoapps.courseware.models import ( ) from common.djangoapps.student.roles import ( CourseBetaTesterRole, - CourseInstructorRole, OrgInstructorRole, OrgStaffRole ) @@ -41,20 +40,6 @@ class UserProfileFactory(StudentUserProfileFactory): # course_key(self, create, extracted, **kwargs) # pylint: disable=unused-argument -class InstructorFactory(UserFactory): - """ - Given a course Location, returns a User object with instructor - permissions for `course`. - """ - last_name = "Instructor" - - @factory.post_generation - def course_key(self, create, extracted, **kwargs): - if extracted is None: - raise ValueError("Must specify a CourseKey for a course instructor user") - CourseInstructorRole(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 256efc3948..46278f5e7a 100644 --- a/lms/djangoapps/courseware/tests/test_access.py +++ b/lms/djangoapps/courseware/tests/test_access.py @@ -24,7 +24,6 @@ import lms.djangoapps.courseware.access_response as access_response from lms.djangoapps.courseware.masquerade import CourseMasquerade from lms.djangoapps.courseware.tests.factories import ( BetaTesterFactory, - InstructorFactory, ) from lms.djangoapps.courseware.tests.helpers import LoginEnrollmentTestCase, masquerade_as_group_member from lms.djangoapps.ccx.models import CustomCourseForEdX @@ -40,6 +39,7 @@ from common.djangoapps.student.tests.factories import ( CourseEnrollmentFactory ) from common.djangoapps.student.tests.factories import GlobalStaffFactory +from common.djangoapps.student.tests.factories import InstructorFactory from common.djangoapps.student.tests.factories import StaffFactory from common.djangoapps.student.tests.factories import UserFactory from common.djangoapps.util.milestones_helpers import fulfill_course_milestone, set_prerequisite_courses diff --git a/lms/djangoapps/courseware/tests/test_entrance_exam.py b/lms/djangoapps/courseware/tests/test_entrance_exam.py index fb8a6d571e..dd60c428b9 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 +from lms.djangoapps.courseware.tests.factories import RequestFactoryNoCsrf 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 InstructorFactory from common.djangoapps.student.tests.factories import StaffFactory from common.djangoapps.student.tests.factories import UserFactory from common.djangoapps.util.milestones_helpers import ( diff --git a/lms/djangoapps/courseware/tests/test_tabs.py b/lms/djangoapps/courseware/tests/test_tabs.py index 58951700bc..295849512c 100644 --- a/lms/djangoapps/courseware/tests/test_tabs.py +++ b/lms/djangoapps/courseware/tests/test_tabs.py @@ -20,13 +20,13 @@ from lms.djangoapps.courseware.tabs import ( ProgressTab, get_course_tab_list ) -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 InstructorFactory from common.djangoapps.student.tests.factories import StaffFactory from common.djangoapps.student.tests.factories import UserFactory from common.djangoapps.util.milestones_helpers import ( diff --git a/lms/djangoapps/courseware/tests/test_view_authentication.py b/lms/djangoapps/courseware/tests/test_view_authentication.py index 5a3ea362ff..cae8cd225e 100644 --- a/lms/djangoapps/courseware/tests/test_view_authentication.py +++ b/lms/djangoapps/courseware/tests/test_view_authentication.py @@ -10,11 +10,11 @@ import pytz from django.urls import reverse from common.djangoapps.student.tests.factories import GlobalStaffFactory +from common.djangoapps.student.tests.factories import InstructorFactory 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, ) diff --git a/lms/djangoapps/discussion/django_comment_client/tests/test_utils.py b/lms/djangoapps/discussion/django_comment_client/tests/test_utils.py index 3e0ee431ee..19efdcb495 100644 --- a/lms/djangoapps/discussion/django_comment_client/tests/test_utils.py +++ b/lms/djangoapps/discussion/django_comment_client/tests/test_utils.py @@ -19,8 +19,8 @@ from common.djangoapps.course_modes.models import CourseMode from common.djangoapps.course_modes.tests.factories import CourseModeFactory from common.djangoapps.student.roles import CourseStaffRole from common.djangoapps.student.tests.factories import AdminFactory, CourseEnrollmentFactory, UserFactory +from common.djangoapps.student.tests.factories import InstructorFactory from lms.djangoapps.courseware.tabs import get_course_tab_list -from lms.djangoapps.courseware.tests.factories import InstructorFactory from lms.djangoapps.discussion.django_comment_client.constants import TYPE_ENTRY, TYPE_SUBCATEGORY from lms.djangoapps.discussion.django_comment_client.tests.factories import RoleFactory from lms.djangoapps.discussion.django_comment_client.tests.unicode import UnicodeTestMixin 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 9e10b208dc..994109cbb4 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,9 +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 InstructorFactory from common.djangoapps.student.tests.factories import StaffFactory from lms.djangoapps.certificates.models import CertificateStatuses, GeneratedCertificate -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/instructor/tests/test_api.py b/lms/djangoapps/instructor/tests/test_api.py index bad67e932c..0594877ac2 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 from common.djangoapps.student.tests.factories import GlobalStaffFactory +from common.djangoapps.student.tests.factories import InstructorFactory from common.djangoapps.student.tests.factories import StaffFactory from common.djangoapps.student.tests.factories import UserFactory from lms.djangoapps.bulk_email.models import BulkEmailFlag, CourseEmail, CourseEmailTemplate @@ -65,7 +66,6 @@ from lms.djangoapps.certificates.tests.factories import ( from lms.djangoapps.courseware.models import StudentModule from lms.djangoapps.courseware.tests.factories import ( BetaTesterFactory, - InstructorFactory, ) 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/test_api_email_localization.py b/lms/djangoapps/instructor/tests/test_api_email_localization.py index f25b0d026c..1863cb544a 100644 --- a/lms/djangoapps/instructor/tests/test_api_email_localization.py +++ b/lms/djangoapps/instructor/tests/test_api_email_localization.py @@ -8,8 +8,8 @@ from django.test.utils import override_settings from django.urls import reverse from common.djangoapps.student.models import CourseEnrollment +from common.djangoapps.student.tests.factories import InstructorFactory from common.djangoapps.student.tests.factories import UserFactory -from lms.djangoapps.courseware.tests.factories import InstructorFactory from openedx.core.djangoapps.lang_pref import LANGUAGE_KEY from openedx.core.djangoapps.user_api.preferences.api import delete_user_preference, set_user_preference from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase diff --git a/lms/djangoapps/instructor/tests/test_certificates.py b/lms/djangoapps/instructor/tests/test_certificates.py index a4bcce421a..53ee6f0cb6 100644 --- a/lms/djangoapps/instructor/tests/test_certificates.py +++ b/lms/djangoapps/instructor/tests/test_certificates.py @@ -21,6 +21,7 @@ from capa.xqueue_interface import XQueueInterface from common.djangoapps.course_modes.models import CourseMode from common.djangoapps.student.models import CourseEnrollment from common.djangoapps.student.tests.factories import GlobalStaffFactory +from common.djangoapps.student.tests.factories import InstructorFactory from common.djangoapps.student.tests.factories import UserFactory from lms.djangoapps.certificates import api as certs_api from lms.djangoapps.certificates.models import ( @@ -35,7 +36,6 @@ from lms.djangoapps.certificates.tests.factories import ( CertificateWhitelistFactory, GeneratedCertificateFactory ) -from lms.djangoapps.courseware.tests.factories import InstructorFactory from lms.djangoapps.grades.tests.utils import mock_passing_grade from lms.djangoapps.verify_student.services import IDVerificationService from lms.djangoapps.verify_student.tests.factories import SoftwareSecurePhotoVerificationFactory diff --git a/lms/djangoapps/instructor_analytics/tests/test_basic.py b/lms/djangoapps/instructor_analytics/tests/test_basic.py index a4469a93d1..4ed98838ae 100644 --- a/lms/djangoapps/instructor_analytics/tests/test_basic.py +++ b/lms/djangoapps/instructor_analytics/tests/test_basic.py @@ -12,7 +12,6 @@ from edx_proctoring.api import create_exam from edx_proctoring.models import ProctoredExamStudentAttempt from opaque_keys.edx.locator import UsageKey from six.moves import range, zip -from lms.djangoapps.courseware.tests.factories import InstructorFactory from lms.djangoapps.instructor_analytics.basic import ( # lint-amnesty, pylint: disable=unused-import AVAILABLE_FEATURES, PROFILE_FEATURES, @@ -28,6 +27,7 @@ from lms.djangoapps.instructor_analytics.basic import ( # lint-amnesty, pylint: from lms.djangoapps.program_enrollments.tests.factories import ProgramEnrollmentFactory from openedx.core.djangoapps.course_groups.tests.helpers import CohortFactory from common.djangoapps.student.models import CourseEnrollment, CourseEnrollmentAllowed +from common.djangoapps.student.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/program_enrollments/rest_api/v1/tests/test_views.py b/lms/djangoapps/program_enrollments/rest_api/v1/tests/test_views.py index 9e0e961e71..09baa4f7ff 100644 --- a/lms/djangoapps/program_enrollments/rest_api/v1/tests/test_views.py +++ b/lms/djangoapps/program_enrollments/rest_api/v1/tests/test_views.py @@ -27,11 +27,11 @@ 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 GlobalStaffFactory +from common.djangoapps.student.tests.factories import InstructorFactory from common.djangoapps.third_party_auth.tests.factories import SAMLProviderConfigFactory from lms.djangoapps.bulk_email.models import BulkEmailFlag, Optout from lms.djangoapps.certificates.models import CertificateStatuses from lms.djangoapps.certificates.tests.factories import GeneratedCertificateFactory -from lms.djangoapps.courseware.tests.factories import InstructorFactory from lms.djangoapps.grades.api import CourseGradeFactory from lms.djangoapps.program_enrollments.constants import ProgramCourseOperationStatuses as CourseStatuses from lms.djangoapps.program_enrollments.constants import ProgramOperationStatuses as ProgramStatuses diff --git a/openedx/core/djangoapps/course_groups/tests/test_views.py b/openedx/core/djangoapps/course_groups/tests/test_views.py index a115d87805..14c7db20f7 100644 --- a/openedx/core/djangoapps/course_groups/tests/test_views.py +++ b/openedx/core/djangoapps/course_groups/tests/test_views.py @@ -15,8 +15,8 @@ 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 from common.djangoapps.student.models import CourseEnrollment +from common.djangoapps.student.tests.factories import InstructorFactory from common.djangoapps.student.tests.factories import StaffFactory from common.djangoapps.student.tests.factories import UserFactory from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase diff --git a/openedx/features/content_type_gating/tests/test_access.py b/openedx/features/content_type_gating/tests/test_access.py index 8b7f795e01..c76a7a8298 100644 --- a/openedx/features/content_type_gating/tests/test_access.py +++ b/openedx/features/content_type_gating/tests/test_access.py @@ -17,11 +17,11 @@ 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 InstructorFactory 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, ) 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 4b2daea7f4..b986bce3b5 100644 --- a/openedx/features/course_duration_limits/tests/test_course_expiration.py +++ b/openedx/features/course_duration_limits/tests/test_course_expiration.py @@ -15,10 +15,10 @@ 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 InstructorFactory from common.djangoapps.student.tests.factories import StaffFactory from lms.djangoapps.courseware.tests.factories import ( BetaTesterFactory, - InstructorFactory, OrgInstructorFactory, OrgStaffFactory, ) 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 8f007273ee..b2003ba7de 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 InstructorFactory 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 @@ -30,7 +31,6 @@ from lms.djangoapps.commerce.utils import EcommerceService from lms.djangoapps.course_goals.api import add_course_goal, remove_course_goal from lms.djangoapps.courseware.tests.factories import ( BetaTesterFactory, - InstructorFactory, OrgInstructorFactory, OrgStaffFactory, )