Skip to content

feat: TNL-10136 tease course enrollment from student model #31344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bszabo merged 9 commits into from
Dec 15, 2022
Merged

feat: TNL-10136 tease course enrollment from student model #31344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2d544f9
feat: TNL-10136 tease course enrollment from student model
Nov 24, 2022
d16b76e
feat: TNL-10136 course_enrollment.py hygiene
Nov 24, 2022
ef7d9d7
feat: TNL-10136 student.py -> user.py
bszabo Nov 24, 2022
d5a5e25
feat: TNL-10136 fix lint errors
Nov 24, 2022
377edc2
feat: TNL-10136 Propagate changes from last PR
Nov 25, 2022
89086d4
feat: TNL-10136 fix build errors
Nov 25, 2022
6e75002
feat: TNL-10136 fix dependencies
Dec 13, 2022
6d25e19
feat: TNL-10136 fix small rebase errors
Dec 13, 2022
5332b5e
feat: TNL-10136 Duplicate lines
Dec 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions common/djangoapps/student/management/tests/test_bulk_change_enrollment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def setUp(self):
self.users = UserFactory.create_batch(5)
CourseOverview.load_from_module_store(self.course.id)

@patch('common.djangoapps.student.models.tracker')
@patch('common.djangoapps.student.models.course_enrollment.tracker')
@ddt.data(('audit', 'honor'), ('honor', 'audit'))
@ddt.unpack
def test_bulk_convert(self, from_mode, to_mode, mock_tracker):
Expand Down Expand Up @@ -55,7 +55,7 @@ def test_bulk_convert(self, from_mode, to_mode, mock_tracker):
CourseEnrollment.objects.get(mode=to_mode, course_id=self.course.id, user=user)
self._assert_mode_changed(mock_tracker, self.course, user, to_mode)

@patch('common.djangoapps.student.models.tracker')
@patch('common.djangoapps.student.models.course_enrollment.tracker')
@ddt.data(('audit', 'no-id-professional'), ('no-id-professional', 'audit'))
@ddt.unpack
def test_bulk_convert_with_org(self, from_mode, to_mode, mock_tracker):
Expand Down Expand Up @@ -108,7 +108,7 @@ def test_with_org_and_course_key(self):

assert 'Error: argument -o/--org: not allowed with argument -c/--course' == str(err.value)

@patch('common.djangoapps.student.models.tracker')
@patch('common.djangoapps.student.models.course_enrollment.tracker')
def test_with_org_and_invalid_to_mode(self, mock_tracker):
"""Verify that enrollments are changed correctly when org was given."""
from_mode = 'audit'
Expand Down
2 changes: 1 addition & 1 deletion common/djangoapps/student/management/tests/test_transfer_students.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def setUp(self, **kwargs): # lint-amnesty, pylint: disable=unused-argument
super().setUp()

UNENROLL_DONE.connect(self.assert_unenroll_signal)
patcher = patch('common.djangoapps.student.models.tracker')
patcher = patch('common.djangoapps.student.models.course_enrollment.tracker')
self.mock_tracker = patcher.start()
self.addCleanup(patcher.stop)
self.addCleanup(UNENROLL_DONE.disconnect, self.assert_unenroll_signal)
Expand Down
5 changes: 5 additions & 0 deletions common/djangoapps/student/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
'''
Student models migrated to folder to tease out the course enrollment aspects from Student
'''
from .course_enrollment import *
from .user import *
Loading