Merge branch 'master' of github.com:edx/mitx into feature-dcadams-usermanagement

This commit is contained in:
dcadams
2013-05-08 14:48:29 -07:00
101 changed files with 2264 additions and 601 deletions

View File

@@ -49,7 +49,6 @@ class TestGradebook(ModuleStoreTestCase):
]
for user in self.users:
UserProfileFactory.create(user=user)
CourseEnrollmentFactory.create(user=user, course_id=self.course.id)
for i in xrange(USER_COUNT-1):
@@ -151,4 +150,4 @@ class TestLetterCutoffPolicy(TestGradebook):
# User 0 has 0 on Homeworks [1]
# User 0 has 0 on the class [1]
# One use at the top of the page [1]
self.assertEquals(3, self.response.content.count('grade_None'))
self.assertEquals(3, self.response.content.count('grade_None'))