diff options
author | adityacp | 2020-03-19 19:45:17 +0530 |
---|---|---|
committer | adityacp | 2020-03-19 19:45:17 +0530 |
commit | 36f43151ab26744cf9edc05d0df3f0fb901fcaaa (patch) | |
tree | c75b5d2730a74191f2c7e51a881e9404f5627c1d /yaksh/test_models.py | |
parent | 9933ec7861faf8abb38224e4b2f5f75fcf9e857a (diff) | |
parent | 1dbaec7dd8098701e11713faa0c9040a315e5fac (diff) | |
download | online_test-36f43151ab26744cf9edc05d0df3f0fb901fcaaa.tar.gz online_test-36f43151ab26744cf9edc05d0df3f0fb901fcaaa.tar.bz2 online_test-36f43151ab26744cf9edc05d0df3f0fb901fcaaa.zip |
Resolve conflicts in the courses view
Diffstat (limited to 'yaksh/test_models.py')
-rw-r--r-- | yaksh/test_models.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/yaksh/test_models.py b/yaksh/test_models.py index 6e5a26d..a60a1d6 100644 --- a/yaksh/test_models.py +++ b/yaksh/test_models.py @@ -322,8 +322,12 @@ class LearningUnitTestCases(unittest.TestCase): def test_learning_unit(self): 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.assertEqual( + self.learning_unit_one.get_lesson_or_quiz(), self.lesson + ) + self.assertEqual( + self.learning_unit_two.get_lesson_or_quiz(), self.quiz + ) self.assertIsNone(self.learning_unit_one.quiz) self.assertIsNone(self.learning_unit_two.lesson) self.assertTrue(self.learning_unit_one.check_prerequisite) |