diff options
| author | prathamesh | 2018-01-02 22:09:44 +0530 |
|---|---|---|
| committer | prathamesh | 2018-01-02 22:09:44 +0530 |
| commit | 44e16651a9f7faec95a32c19738a996a731ae57a (patch) | |
| tree | 0aa8439547b0f1281ab78964aaf3f7ad176ed6da /yaksh/test_models.py | |
| parent | e14514e01052fb36cd9f14675cbe7ca940945a34 (diff) | |
| parent | e566d54239efcb46f253e324b7295a676378f656 (diff) | |
| download | online_test-44e16651a9f7faec95a32c19738a996a731ae57a.tar.gz online_test-44e16651a9f7faec95a32c19738a996a731ae57a.tar.bz2 online_test-44e16651a9f7faec95a32c19738a996a731ae57a.zip | |
Merge branch 'master' of https://github.com/FOSSEE/online_test into exercise
Conflicts Resolved:
yaksh/templates/yaksh/courses.html
yaksh/templates/yaksh/question.html
Diffstat (limited to 'yaksh/test_models.py')
| -rw-r--r-- | yaksh/test_models.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/yaksh/test_models.py b/yaksh/test_models.py index 9174033..59dea5b 100644 --- a/yaksh/test_models.py +++ b/yaksh/test_models.py @@ -87,9 +87,9 @@ def setUpModule(): lesson = Lesson.objects.create(name='L1', description='Video Lesson', creator=user) learning_unit_lesson = LearningUnit.objects.create(order=1, lesson=lesson, - learning_type='lesson') + type='lesson') learning_unit_quiz = LearningUnit.objects.create(order=2, quiz=quiz, - learning_type='quiz') + type='quiz') learning_module_one.learning_unit.add(learning_unit_lesson) learning_module_one.learning_unit.add(learning_unit_quiz) learning_module_one.save() @@ -214,8 +214,8 @@ class LearningUnitTestCases(unittest.TestCase): self.quiz = Quiz.objects.get(description='demo quiz 1') def test_learning_unit(self): - self.assertEqual(self.learning_unit_one.learning_type, 'lesson') - self.assertEqual(self.learning_unit_two.learning_type, 'quiz') + self.assertEqual(self.learning_unit_one.type, 'lesson') + self.assertEqual(self.learning_unit_two.type, 'quiz') self.assertEqual(self.learning_unit_one.lesson, self.lesson) self.assertEqual(self.learning_unit_two.quiz, self.quiz) self.assertIsNone(self.learning_unit_one.quiz) |