Correcting faulty merge conflict. Bismillah

core/tests/test_vacancies.py

@@ -190,10 +190,6 @@ class CompanyListsTests(APITestCase):
 class SupervisorStudentApplicationTests(APITestCase):
 
     def test_list_student_application(self):
-
-class SupervisorApprovalTests(APITestCase):
-
-    def test_supervisor_approve_vacancy(self):
         new_user = User.objects.create_user('dummy.supervisor', 'dummy.supervisor@asd.asd', 'lalala123')
         new_supervisor = Supervisor.objects.create(user=new_user, nip=1212121212)
         self.client.force_authenticate(user=new_user)
@@ -210,6 +206,13 @@ class SupervisorApprovalTests(APITestCase):
         response = self.client.get(url, format='json')
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
 
+class SupervisorApprovalTests(APITestCase):
+
+    def test_supervisor_approve_vacancy(self):
+        new_user = User.objects.create_user('dummy.supervisor', 'dummy.supervisor@asd.asd', 'lalala123')
+        new_supervisor = Supervisor.objects.create(user=new_user, nip=1212121212)
+        self.client.force_authenticate(user=new_user)
+
         new_user2 = User.objects.create_user('dummy.company2', 'dummy.compan2y@company.com', 'lalala123')
         new_company2 = Company.objects.create(user=new_user2, description="lalala", status=Company.VERIFIED, logo=None,
                                              address=None)

core/views/vacancies.py

@@ -12,7 +12,7 @@ from core.lib.permissions import IsAdminOrStudent, IsAdminOrCompany, IsAdminOrVa
 from core.models import Student, Company
 from core.models.vacancies import Vacancy, Application
 from core.serializers.vacancies import VacancySerializer, ApplicationSerializer, ApplicationStatusSerializer, \
-    VacancyApplicationSerializer, PostVacancySerializer, VacancyVerifiedSerializer
+    VacancyApplicationSerializer, PostVacancySerializer, VacancyVerifiedSerializer, SupervisorStudentApplicationSerializer
 
 
 class VacancyViewSet(MultiSerializerViewSetMixin, viewsets.ModelViewSet):