chore: rebase

backend/api/tests/test_group.py

@@ -1,6 +1,5 @@
 import json
 from datetime import timedelta
-from django.utils.translation import gettext
 from django.urls import reverse
 from django.utils import timezone
 from rest_framework.test import APITestCase
@@ -57,90 +56,6 @@ def setUp(self) -> None:
             User.get_dummy_admin()
         )
 
-    def test_no_groups(self):
-        """Able to retrieve no groups before creating any."""
-        response = self.client.get(reverse("group-list"), follow=True)
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.accepted_media_type, "application/json")
-        content_json = json.loads(response.content.decode("utf-8"))
-        self.assertEqual(content_json, [])
-
-    def test_group_exists(self):
-        """Able to retrieve a single group after creating it."""
-        course = create_course(name="sel2", academic_startyear=2023)
-
-        project = create_project(
-            name="Project 1", description="Description 1", days=7, course=course
-        )
-
-        student = create_student(
-            id=1, first_name="John", last_name="Doe", email="[email protected]"
-        )
-
-        group = create_group(project=project, score=10)
-        group.students.add(student)
-
-        response = self.client.get(reverse("group-list"), follow=True)
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.accepted_media_type, "application/json")
-        content_json = json.loads(response.content.decode("utf-8"))
-        self.assertEqual(len(content_json), 1)
-
-        retrieved_group = content_json[0]
-        expected_project_url = settings.TESTING_BASE_LINK + reverse(
-            "project-detail", args=[str(project.id)]
-        )
-
-        self.assertEqual(retrieved_group["project"], expected_project_url)
-        self.assertEqual(int(retrieved_group["id"]), group.id)
-        self.assertEqual(retrieved_group["score"], group.score)
-
-    def test_multiple_groups(self):
-        """Able to retrieve multiple groups after creating them."""
-        course = create_course(name="sel2", academic_startyear=2023)
-
-        project1 = create_project(
-            name="Project 1", description="Description 1", days=7, course=course
-        )
-        project2 = create_project(
-            name="Project 2", description="Description 2", days=7, course=course
-        )
-
-        student1 = create_student(
-            id=2, first_name="Bart", last_name="Rex", email="[email protected]"
-        )
-        student2 = create_student(
-            id=3, first_name="Jane", last_name="Doe", email="[email protected]"
-        )
-
-        group1 = create_group(project=project1, score=10)
-        group1.students.add(student1)
-
-        group2 = create_group(project=project2, score=10)
-        group2.students.add(student1, student2)
-
-        response = self.client.get(reverse("group-list"), follow=True)
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.accepted_media_type, "application/json")
-        content_json = json.loads(response.content.decode("utf-8"))
-        self.assertEqual(len(content_json), 2)
-
-        retrieved_group1, retrieved_group2 = content_json
-        expected_project_url1 = settings.TESTING_BASE_LINK + reverse(
-            "project-detail", args=[str(project1.id)]
-        )
-        expected_project_url2 = settings.TESTING_BASE_LINK + reverse(
-            "project-detail", args=[str(project2.id)]
-        )
-
-        self.assertEqual(retrieved_group1["project"], expected_project_url1)
-        self.assertEqual(int(retrieved_group1["id"]), group1.id)
-        self.assertEqual(retrieved_group1["score"], group1.score)
-
-        self.assertEqual(retrieved_group2["project"], expected_project_url2)
-        self.assertEqual(int(retrieved_group2["id"]), group2.id)
-        self.assertEqual(retrieved_group2["score"], group2.score)
-
     def test_group_detail_view(self):
         """Able to retrieve details of a single group."""
         course = create_course(name="sel2", academic_startyear=2023)

backend/api/tests/test_project.py

@@ -218,18 +218,6 @@ def test_project_exists(self):
         self.assertEqual(retrieved_project["archived"], project.archived)
         self.assertEqual(retrieved_project["course"], expected_course_url)
 
-        retrieved_project = content_json[1]
-
-        expected_course_url = settings.TESTING_BASE_LINK + reverse(
-            "course-detail", args=[str(course.id)]
-        )
-
-        self.assertEqual(retrieved_project["name"], project2.name)
-        self.assertEqual(retrieved_project["description"], project2.description)
-        self.assertEqual(retrieved_project["visible"], project2.visible)
-        self.assertEqual(retrieved_project["archived"], project2.archived)
-        self.assertEqual(retrieved_project["course"], expected_course_url)
-
     def test_project_course(self):
         """
         Able to retrieve a course of a project after creating it.