Add some Testing

unisportomat/quiz/serializers.py

@@ -318,7 +318,7 @@ class SnackTivityListSerializer(serializers.BaseSerializer):
                 {
                     "id": obj.pk,
                     "text_de": obj.text_de,
-                    "text_en": obj.text_en,
+                    "text_en": obj.text_en or "",
                     "has_image": has_image,
                 }
             )

unisportomat/quiz/tests.py

@@ -3,6 +3,7 @@
 import os
 import shutil
 import tempfile
+import shutil
 
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.management import call_command
@@ -392,8 +393,13 @@ class APITest(APITestCase):
         "criteria.json",
         "criterion_ratings.json",
         "questions.json",
+        "knowledge_snacks.json",
+        "calls_to_move.json",
     ]
 
+    shutil.copy("quiz/fixtures/images/logo.png", "media/")
+    shutil.copy("quiz/fixtures/images/test_image.png", "media/")
+
     def test_get_sport_returns_correct_data(self):
         """Test the API endpoint /sport/{id}"""
         response = self.client.get(reverse("small-sport-list-detail", kwargs={"pk": 1}))
@@ -635,6 +641,106 @@ class APITest(APITestCase):
 
         self.assertEqual(response.data["results"], [])
 
+    def test_snack_get(self):
+        """
+        Test GET of Snack
+        """
+
+        response = self.client.get(reverse("snack-list"), format="json")
+
+        self.assertEqual(len(response.data["results"]), 1)
+        self.assertEqual(
+            response.data["results"][0]["text_de"],
+            "Dass Treppensteigen fast 5x so viele Kalorien verbrennt, als die Nutzung des Aufzuges?",
+        )
+        self.assertEqual(response.data["results"][0]["text_en"], "")
+
+        self.assertEqual(response.data["results"][0]["has_image"], True)
+
+        # Test Detail GET as well
+        response = self.client.get(
+            reverse("snack-detail", kwargs={"pk": 1}), format="json"
+        )
+
+        self.assertEqual(
+            response.data["text_de"],
+            "Dass Treppensteigen fast 5x so viele Kalorien verbrennt, als die Nutzung des Aufzuges?",
+        )
+        self.assertEqual(response.data["text_en"], "")
+
+        self.assertEqual(response.data["has_image"], True)
+        self.assertNotEqual(response.data["image"], "")
+
+    def test_snack_remove_image(self):
+        """
+        Test whether the image of snack can be deleted
+        """
+
+        response = self.client.get(
+            reverse("snack-detail", kwargs={"pk": 1}), format="json"
+        )
+        self.assertNotEqual(response.data["image"], "")
+
+        self.client.patch(
+            reverse("snack-detail", kwargs={"pk": 1}),
+            format="json",
+            data={"image": "", "image_type": ""},
+        )
+        response = self.client.get(
+            reverse("snack-detail", kwargs={"pk": 1}), format="json"
+        )
+        self.assertEqual(response.data["image"], "")
+
+    def test_activity_get(self):
+        """
+        Test GET of activity
+        """
+
+        response = self.client.get(reverse("activity-list"), format="json")
+
+        self.assertEqual(len(response.data["results"]), 1)
+        self.assertEqual(
+            response.data["results"][0]["text_de"],
+            "Kreise deine Arme vor der nächsten Frage 3x nach hinten",
+        )
+        self.assertEqual(response.data["results"][0]["text_en"], "")
+
+        self.assertEqual(response.data["results"][0]["has_image"], True)
+
+        # Test Detail GET as well
+        response = self.client.get(
+            reverse("activity-detail", kwargs={"pk": 1}), format="json"
+        )
+
+        self.assertEqual(
+            response.data["text_de"],
+            "Kreise deine Arme vor der nächsten Frage 3x nach hinten",
+        )
+        self.assertEqual(response.data["text_en"], "")
+
+        self.assertEqual(response.data["has_image"], True)
+        self.assertNotEqual(response.data["image"], "")
+
+    def test_activity_remove_image(self):
+        """
+        Test whether the image of activity can be deleted
+        """
+
+        response = self.client.get(
+            reverse("activity-detail", kwargs={"pk": 1}), format="json"
+        )
+        self.assertNotEqual(response.data["image"], "")
+
+        self.client.patch(
+            reverse("activity-detail", kwargs={"pk": 1}),
+            format="json",
+            data={"image": "", "image_type": ""},
+        )
+        response = self.client.get(
+            reverse("activity-detail", kwargs={"pk": 1}), format="json"
+        )
+        self.assertEqual(response.data["image"], "")
+
 
 class QuestionOrderEntry_Test(TestCase):
     """

unisportomat/quiz/views.py

@@ -99,11 +99,14 @@ class SmallSportListView(viewsets.ViewSet):
             "is_filled": "pk",
             "-is_filled": "-pk",
         }
+
+        order_by = "pk"
+        if "ordering" in request.query_params.keys():
+            order_by = order_by_dict[request.query_params.get("ordering")]
+
         # TODO: Maybe care for is_filled ordering
 
-        sports = Sport.objects.all().order_by(
-            order_by_dict[request.query_params.get("ordering")]
-        )
+        sports = Sport.objects.all().order_by(order_by)
         sports = paginator.paginate_queryset(sports, request)
         is_filled_tuples = []