From a751702aa32ea0616ab74ec5d95b9b2becb441c4 Mon Sep 17 00:00:00 2001 From: Miles Steele Date: Thu, 27 Jun 2013 14:58:29 -0400 Subject: [PATCH] fix legacy tests to point to legacy --- lms/djangoapps/instructor/tests/test_legacy_enrollment.py | 2 +- lms/djangoapps/instructor/tests/test_legacy_gradebook.py | 2 +- lms/djangoapps/instructor/tests/test_legacy_xss.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lms/djangoapps/instructor/tests/test_legacy_enrollment.py b/lms/djangoapps/instructor/tests/test_legacy_enrollment.py index 964441c094..88820158a0 100644 --- a/lms/djangoapps/instructor/tests/test_legacy_enrollment.py +++ b/lms/djangoapps/instructor/tests/test_legacy_enrollment.py @@ -12,7 +12,7 @@ from xmodule.modulestore.tests.factories import CourseFactory from student.tests.factories import UserFactory, CourseEnrollmentFactory, AdminFactory from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from student.models import CourseEnrollment, CourseEnrollmentAllowed -from instructor.views import get_and_clean_student_list, send_mail_to_student +from instructor.views.legacy import get_and_clean_student_list, send_mail_to_student from django.core import mail USER_COUNT = 4 diff --git a/lms/djangoapps/instructor/tests/test_legacy_gradebook.py b/lms/djangoapps/instructor/tests/test_legacy_gradebook.py index 2677df59b2..8be648a930 100644 --- a/lms/djangoapps/instructor/tests/test_legacy_gradebook.py +++ b/lms/djangoapps/instructor/tests/test_legacy_gradebook.py @@ -42,7 +42,7 @@ class TestGradebook(ModuleStoreTestCase): metadata={'graded': True, 'format': 'Homework'} ) - self.users = [UserFactory() for _ in xrange(USER_COUNT)] + self.users = [UserFactory.create() for _ in xrange(USER_COUNT)] for user in self.users: CourseEnrollmentFactory.create(user=user, course_id=self.course.id) diff --git a/lms/djangoapps/instructor/tests/test_legacy_xss.py b/lms/djangoapps/instructor/tests/test_legacy_xss.py index 87bd2ee16b..7df6511b3c 100644 --- a/lms/djangoapps/instructor/tests/test_legacy_xss.py +++ b/lms/djangoapps/instructor/tests/test_legacy_xss.py @@ -12,7 +12,7 @@ from student.tests.factories import UserFactory, CourseEnrollmentFactory from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory -from instructor import views +from instructor.views import legacy @override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE) class TestXss(ModuleStoreTestCase): @@ -47,7 +47,7 @@ class TestXss(ModuleStoreTestCase): ) req.user = self._instructor req.session = {} - resp = views.instructor_dashboard(req, self._course.id) + resp = legacy.instructor_dashboard(req, self._course.id) respUnicode = resp.content.decode(settings.DEFAULT_CHARSET) self.assertNotIn(self._evil_student.profile.name, respUnicode) self.assertIn(escape(self._evil_student.profile.name), respUnicode)