From c7afae928b1b78556d26fc389fb4cfee4078a816 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Fri, 26 Jul 2024 18:50:16 +0200 Subject: [PATCH] Fix unit tests --- .../competence/tests/test_graphql.py | 129 +++++++++--------- 1 file changed, 66 insertions(+), 63 deletions(-) diff --git a/server/vbv_lernwelt/competence/tests/test_graphql.py b/server/vbv_lernwelt/competence/tests/test_graphql.py index e3f50c28..9f91bfee 100644 --- a/server/vbv_lernwelt/competence/tests/test_graphql.py +++ b/server/vbv_lernwelt/competence/tests/test_graphql.py @@ -71,23 +71,23 @@ class TestCertificateList(GraphQLTestCase): def test_supervisor_userprofile_certificate_summary(self): self.client.force_login(self.supervisor) - query = f"""query competenceCertificateForUserQuery( + query = """query competenceCertificateForUserQuery( $courseSlug: String!, $courseSessionId: ID!, - $userId: UUID! -) {{ + $userIds: [UUID!] +) { competence_certificate_list( course_slug: $courseSlug, - user_id: $userId - ) {{ + user_ids: $userIds + ) { ...CoursePageFields - competence_certificates {{ + competence_certificates { ...CoursePageFields - assignments {{ + assignments { ...CoursePageFields assignment_type max_points - completion(course_session_id: $courseSessionId) {{ + completions(course_session_id: $courseSessionId) { id completion_status submitted_at @@ -95,39 +95,39 @@ class TestCertificateList(GraphQLTestCase): evaluation_max_points evaluation_passed __typename - }} - learning_content {{ + } + learning_content { ...CoursePageFields - circle {{ + circle { id title slug __typename - }} + } __typename - }} + } __typename - }} + } __typename - }} + } __typename - }} -}} + } +} -fragment CoursePageFields on CoursePageInterface {{ +fragment CoursePageFields on CoursePageInterface { title id slug content_type frontend_url __typename -}} +} """ variables = { "courseSessionId": str(self.course_session.id), "courseSlug": self.course.slug, - "userId": str(self.member_one.id), + "userIds": [str(self.member_one.id)], } # WHEN @@ -144,35 +144,35 @@ fragment CoursePageFields on CoursePageInterface {{ assignments = certificates[0]["assignments"] self.assertEqual(len(assignments), 2) - completion1 = assignments[0]["completion"] + completion1 = assignments[0]["completions"][0] self.assertEqual(completion1["completion_status"], "SUBMITTED") self.assertEqual(completion1["evaluation_points"], 5) self.assertEqual(completion1["evaluation_max_points"], 10) self.assertEqual(completion1["evaluation_passed"], False) - completion2 = assignments[1]["completion"] - self.assertIsNone(completion2) + completion2 = assignments[1]["completions"] + self.assertEqual(len(completion2), 0) def test_member_cannot_see_other_user_certificate_summary(self): self.client.force_login(self.member_one) - query = f"""query competenceCertificateForUserQuery( + query = """query competenceCertificateForUserQuery( $courseSlug: String!, $courseSessionId: ID!, - $userId: UUID! - ) {{ + $userIds: [UUID!] + ) { competence_certificate_list( course_slug: $courseSlug, - user_id: $userId - ) {{ + user_ids: $userIds + ) { ...CoursePageFields - competence_certificates {{ + competence_certificates { ...CoursePageFields - assignments {{ + assignments { ...CoursePageFields assignment_type max_points - completion(course_session_id: $courseSessionId) {{ + completions(course_session_id: $courseSessionId) { id completion_status submitted_at @@ -180,39 +180,39 @@ fragment CoursePageFields on CoursePageInterface {{ evaluation_max_points evaluation_passed __typename - }} - learning_content {{ + } + learning_content { ...CoursePageFields - circle {{ + circle { id title slug __typename - }} + } __typename - }} + } __typename - }} + } __typename - }} + } __typename - }} - }} + } + } - fragment CoursePageFields on CoursePageInterface {{ + fragment CoursePageFields on CoursePageInterface { title id slug content_type frontend_url __typename - }} + } """ variables = { "courseSessionId": str(self.course_session.id), "courseSlug": self.course.slug, - "userId": str(self.member_two.id), + "userIds": [str(self.member_two.id)], } # WHEN @@ -225,21 +225,23 @@ fragment CoursePageFields on CoursePageInterface {{ def test_member_userprofile_certificate_summary(self): self.client.force_login(self.member_one) - query = f"""query competenceCertificateForUserQuery( + query = """query competenceCertificateForUserQuery( $courseSlug: String!, $courseSessionId: ID!, -) {{ + $userIds: [UUID!], +) { competence_certificate_list( course_slug: $courseSlug, - ) {{ + user_ids: $userIds + ) { ...CoursePageFields - competence_certificates {{ + competence_certificates { ...CoursePageFields - assignments {{ + assignments { ...CoursePageFields assignment_type max_points - completion(course_session_id: $courseSessionId) {{ + completions(course_session_id: $courseSessionId) { id completion_status submitted_at @@ -247,38 +249,39 @@ fragment CoursePageFields on CoursePageInterface {{ evaluation_max_points evaluation_passed __typename - }} - learning_content {{ + } + learning_content { ...CoursePageFields - circle {{ + circle { id title slug __typename - }} + } __typename - }} + } __typename - }} + } __typename - }} + } __typename - }} -}} + } +} -fragment CoursePageFields on CoursePageInterface {{ +fragment CoursePageFields on CoursePageInterface { title id slug content_type frontend_url __typename -}} +} """ variables = { "courseSessionId": str(self.course_session.id), "courseSlug": self.course.slug, + "userIds": [str(self.member_one.id)], } # WHEN @@ -295,11 +298,11 @@ fragment CoursePageFields on CoursePageInterface {{ assignments = certificates[0]["assignments"] self.assertEqual(len(assignments), 2) - completion1 = assignments[0]["completion"] + completion1 = assignments[0]["completions"][0] self.assertEqual(completion1["completion_status"], "SUBMITTED") self.assertEqual(completion1["evaluation_points"], 5) self.assertEqual(completion1["evaluation_max_points"], 10) self.assertEqual(completion1["evaluation_passed"], False) - completion2 = assignments[1]["completion"] - self.assertIsNone(completion2) + completion2 = assignments[1]["completions"] + self.assertEqual(len(completion2), 0)