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_views.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_views.py')
| -rw-r--r-- | yaksh/test_views.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/yaksh/test_views.py b/yaksh/test_views.py index 129378f..71d6f80 100644 --- a/yaksh/test_views.py +++ b/yaksh/test_views.py @@ -497,7 +497,7 @@ class TestMonitor(TestCase): creator=self.user ) self.learning_unit = LearningUnit.objects.create( - order=1, learning_type="quiz", quiz=self.quiz) + order=1, type="quiz", quiz=self.quiz) self.learning_module = LearningModule.objects.create( order=1, name="test module", description="test", creator=self.user, check_prerequisite=False) @@ -671,7 +671,7 @@ class TestGradeUser(TestCase): creator=self.user ) self.learning_unit = LearningUnit.objects.create( - order=1, learning_type="quiz", quiz=self.quiz) + order=1, type="quiz", quiz=self.quiz) self.learning_module = LearningModule.objects.create( order=1, name="test module", description="test", creator=self.user, check_prerequisite=False) @@ -877,7 +877,7 @@ class TestDownloadAssignment(TestCase): description='demo_quiz', pass_criteria=40 ) self.learning_unit = LearningUnit.objects.create( - order=1, learning_type="quiz", quiz=self.quiz) + order=1, type="quiz", quiz=self.quiz) self.learning_module = LearningModule.objects.create( order=1, name="test module", description="test", creator=self.user, check_prerequisite=False) @@ -3977,7 +3977,7 @@ class TestQuestionPaper(TestCase): ) self.learning_unit = LearningUnit.objects.create( - order=1, learning_type="quiz", quiz=self.quiz) + order=1, type="quiz", quiz=self.quiz) self.learning_module = LearningModule.objects.create( order=1, name="test module", description="module", check_prerequisite=False, creator=self.user) @@ -4429,12 +4429,12 @@ class TestLearningModule(TestCase): self.lesson = Lesson.objects.create( name="test lesson", description="test description", creator=self.user) - # create quiz leanring unit + # create quiz learning unit self.learning_unit = LearningUnit.objects.create( - order=0, learning_type="quiz", quiz=self.quiz) - # create lesson leanring unit + order=0, type="quiz", quiz=self.quiz) + # create lesson learning unit self.learning_unit1 = LearningUnit.objects.create( - order=1, learning_type="lesson", lesson=self.lesson) + order=1, type="lesson", lesson=self.lesson) # create learning module self.learning_module = LearningModule.objects.create( order=0, name="test module", description="module", @@ -4573,7 +4573,7 @@ class TestLearningModule(TestCase): self.assertTemplateUsed(response, 'yaksh/add_module.html') learning_unit = self.learning_module1.learning_unit.all().first() self.assertEqual(self.quiz, learning_unit.quiz) - self.assertEqual(learning_unit.learning_type, "quiz") + self.assertEqual(learning_unit.type, "quiz") self.assertEqual(learning_unit.order, 1) # Test change order of learning unit @@ -4777,7 +4777,7 @@ class TestLessons(TestCase): name="test lesson", description="test description", creator=self.user) self.learning_unit = LearningUnit.objects.create( - order=0, learning_type="lesson", lesson=self.lesson) + order=0, type="lesson", lesson=self.lesson) self.learning_module = LearningModule.objects.create( order=0, name="test module", description="module", check_prerequisite=False, creator=self.user) |