Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CohortMemberships Unit Test Updates

Browse Source 
Updating previously-existing unit tests to function with the new
CohortMembership model.
This commit is contained in:
Eric Fischer
2015-10-23 15:16:30 -04:00
parent 83163e58f8
commit 08ed3b547f
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/djangoapps/instructor_task/tasks_helper.py
View File

@@ -1486,8 +1486,7 @@ def cohort_students_and_upload(_xmodule_instance_args, _entry_id, course_id, tas
continue
try:
with transaction.commit_on_success():
add_user_to_cohort(cohorts_status[cohort_name]['cohort'], username_or_email)
add_user_to_cohort(cohorts_status[cohort_name]['cohort'], username_or_email)
cohorts_status[cohort_name]['Students Added'] += 1
task_progress.succeeded += 1
except User.DoesNotExist:

20
lms/djangoapps/instructor_task/tests/test_tasks_helper.py
View File

@@ -20,7 +20,7 @@ from certificates.tests.factories import GeneratedCertificateFactory, Certificat
from course_modes.models import CourseMode
from courseware.tests.factories import InstructorFactory
from instructor_task.tests.test_base import InstructorTaskCourseTestCase, TestReportMixin, InstructorTaskModuleTestCase
from openedx.core.djangoapps.course_groups.models import CourseUserGroupPartitionGroup
from openedx.core.djangoapps.course_groups.models import CourseUserGroupPartitionGroup, CohortMembership
from openedx.core.djangoapps.course_groups.tests.helpers import CohortFactory
import openedx.core.djangoapps.user_api.course_tag.api as course_tag_api
from openedx.core.djangoapps.user_api.partition_schemes import RandomUserPartitionScheme
@@ -144,8 +144,10 @@ class TestInstructorGradeReport(InstructorGradeReportTestCase):
magneto = u'MàgnëtÖ'
cohort1 = CohortFactory(course_id=course.id, name=professor_x)
cohort2 = CohortFactory(course_id=course.id, name=magneto)
cohort1.users.add(user1)
cohort2.users.add(user2)
membership1 = CohortMembership(course_user_group=cohort1, user=user1)
membership1.save()
membership2 = CohortMembership(course_user_group=cohort2, user=user2)
membership2.save()
self._verify_cell_data_for_user(user1.username, course.id, 'Cohort Name', professor_x)
self._verify_cell_data_for_user(user2.username, course.id, 'Cohort Name', magneto)
@@ -1399,8 +1401,10 @@ class TestCohortStudents(TestReportMixin, InstructorTaskCourseTestCase):
)
def test_move_users_to_new_cohort(self):
self.cohort_1.users.add(self.student_1)
self.cohort_2.users.add(self.student_2)
membership1 = CohortMembership(course_user_group=self.cohort_1, user=self.student_1)
membership1.save()
membership2 = CohortMembership(course_user_group=self.cohort_2, user=self.student_2)
membership2.save()
result = self._cohort_students_and_upload(
u'username,email,cohort\n'
@@ -1417,8 +1421,10 @@ class TestCohortStudents(TestReportMixin, InstructorTaskCourseTestCase):
)
def test_move_users_to_same_cohort(self):
self.cohort_1.users.add(self.student_1)
self.cohort_2.users.add(self.student_2)
membership1 = CohortMembership(course_user_group=self.cohort_1, user=self.student_1)
membership1.save()
membership2 = CohortMembership(course_user_group=self.cohort_2, user=self.student_2)
membership2.save()
result = self._cohort_students_and_upload(
u'username,email,cohort\n'