fixup! fixed tests

Author: jooooosef

evap/staff/tests/test_views.py

@@ -932,21 +932,25 @@ def setUpTestData(cls):
     def test_assign_questionnaires(self) -> None:
         page = self.app.get(self.url, user=self.manager)
         assign_form = page.forms["questionnaire-assign-form"]
-        assign_form["general-" + str(self.seminar_type.id)] = [self.questionnaire_general.pk]
-        assign_form["contributor-" + str(self.lecture_type.id)] = [self.questionnaire_contributor.pk]
+        assign_form[f"general-{self.seminar_type.id}"] = [self.questionnaire_general.pk]
+        assign_form[f"contributor-{self.lecture_type.id}"] = [self.questionnaire_contributor.pk]
         page = assign_form.submit().follow()
 
         for evaluation in self.semester.evaluations.all():
             if evaluation.course.type == self.seminar_type:
-                self.assertEqual(evaluation.general_contribution.questionnaires.count(), 1)
-                self.assertEqual(evaluation.general_contribution.questionnaires.get(), self.questionnaire_general)
+                self.assertQuerySetEqual(
+                    evaluation.general_contribution.questionnaires.all(), [self.questionnaire_general]
+                )
                 for contribution in evaluation.contributions.exclude(contributor=None):  # contributions without general
                     self.assertEqual(contribution.questionnaires.count(), 0)
             if evaluation.course.type == self.lecture_type:
                 self.assertEqual(evaluation.general_contribution.questionnaires.count(), 0)
                 for contribution in evaluation.contributions.exclude(contributor=None):
-                    self.assertEqual(contribution.questionnaires.count(), 1)
-                    self.assertEqual(contribution.questionnaires.get(), self.questionnaire_contributor)
+                    self.assertQuerySetEqual(
+                        contribution.questionnaires.all(), [self.questionnaire_contributor]
+                    )
+                    #self.assertEqual(contribution.questionnaires.count(), 1)
+                    #self.assertEqual(contribution.questionnaires.get(), self.questionnaire_contributor)
 
 
 class TestSemesterQuestionnaireAssignment(WebTestStaffMode):
@@ -988,9 +992,9 @@ def setUpTestData(cls):
     def test_questionnaire_assignment(self):
         page = self.app.get(self.url, user=self.manager, status=200)
         form = page.forms["questionnaire-assign-form"]
-        form["general-" + str(self.course_type_1.id)] = [self.questionnaire_1.pk, self.questionnaire_2.pk]
-        form["general-" + str(self.course_type_2.id)] = [self.questionnaire_2.pk]
-        form["contributor-" + str(self.course_type_1.id)] = [self.questionnaire_responsible.pk]
+        form[f"general-{self.course_type_1.id}"] = [self.questionnaire_1.pk, self.questionnaire_2.pk]
+        form[f"general-{self.course_type_2.id}"] = [self.questionnaire_2.pk]
+        form[f"contributor-{self.course_type_1.id}"] = [self.questionnaire_responsible.pk]
 
         response = form.submit().follow()
         self.assertIn("Successfully", str(response))