Modifications that syncronize several previously merged branches

• Fixed errors that arose from merging errors
• Added feedback to mock data so student page works
• Student serializer now only send necessary submission info on initial load

core/tests/test_student_page.py

@@ -49,7 +49,8 @@ class StudentPageTests(APITestCase):
             }]
         })
 
-        self.student = self.test_data['students'][0].student
+        self.student = self.test_data['students'][0]
+        self.student_info = self.student.student
         self.tutor = self.test_data['tutors'][0]
         self.reviewer = self.test_data['reviewers'][0]
         self.submission = self.test_data['submissions'][0]
@@ -57,7 +58,7 @@ class StudentPageTests(APITestCase):
 
         self.request = self.factory.get(reverse('student-page'))
         self.view = StudentSelfApiView.as_view()
-        force_authenticate(self.request, user=self.student.user)
+        force_authenticate(self.request, user=self.student)
         self.response = self.view(self.request)
 
         self.exam_obj = self.response.data['exam']
@@ -66,7 +67,7 @@ class StudentPageTests(APITestCase):
 
     def test_student_information_contains_name(self):
         self.assertEqual(
-            self.response.data['name'], self.student.user.fullname)
+            self.response.data['name'], self.student.fullname)
 
     def test_all_student_submissions_are_loded(self):
         self.assertEqual(len(self.submission_list),
@@ -76,40 +77,40 @@ class StudentPageTests(APITestCase):
     def test_exam_data_contains_module_reference(self):
         self.assertEqual(
             self.exam_obj["module_reference"],
-            self.student.exam.module_reference)
+            self.student_info.exam.module_reference)
 
     def test_exam_data_contains_total_score(self):
         self.assertEqual(
-            self.exam_obj["total_score"], self.student.exam.total_score)
+            self.exam_obj["total_score"], self.student_info.exam.total_score)
 
     def test_exam_data_contains_pass_score(self):
         self.assertEqual(
-            self.exam_obj["pass_score"], self.student.exam.pass_score)
+            self.exam_obj["pass_score"], self.student_info.exam.pass_score)
 
     def test_exam_data_contains_pass_only_field(self):
         self.assertEqual(
-            self.exam_obj["pass_only"], self.student.exam.pass_only)
+            self.exam_obj["pass_only"], self.student_info.exam.pass_only)
 
     # Tests concerning submission data
     def test_a_student_submissions_contains_type_name(self):
         self.assertEqual(
-            self.submission_list_first_entry['typeName'],
-            self.student.submissions.first().type.name)
+            self.submission_list_first_entry['type']['name'],
+            self.student_info.submissions.first().type.name)
 
     def test_a_student_submissions_contains_type_id(self):
         self.assertEqual(
-            self.submission_list_first_entry['typeId'],
-            self.student.submissions.first().type.id)
+            self.submission_list_first_entry['type']['id'],
+            self.student_info.submissions.first().type.id)
 
     def test_submission_data_contains_full_score(self):
         self.assertEqual(
-            self.submission_list_first_entry['fullScore'],
-            self.student.submissions.first().type.full_score)
+            self.submission_list_first_entry['type']['fullScore'],
+            self.student_info.submissions.first().type.full_score)
 
     def test_submission_data_contains_feedback_score(self):
         self.assertEqual(
-            self.submission_list_first_entry['score'],
-            self.student.submissions.first().feedback.score)
+            self.submission_list_first_entry['feedback']['score'],
+            self.student_info.submissions.first().feedback.score)
 
     # We don't want a matriculation number here
     def test_matriculation_number_is_not_send(self):
@@ -148,7 +149,8 @@ class StudentSelfSubmissionsTests(APITestCase):
             }]
         })
 
-        self.student = self.test_data['students'][0].student
+        self.student = self.test_data['students'][0]
+        self.student_info = self.student.student
         self.tutor = self.test_data['tutors'][0]
         self.submission = self.test_data['submissions'][0]
         self.feedback = self.submission.feedback
@@ -156,7 +158,7 @@ class StudentSelfSubmissionsTests(APITestCase):
         self.request = self.factory.get(reverse('student-submissions'))
         self.view = StudentSelfSubmissionsApiView.as_view()
 
-        force_authenticate(self.request, user=self.student.user)
+        force_authenticate(self.request, user=self.student)
         self.response = self.view(self.request)
 
         self.submission_list = self.response.data
@@ -165,33 +167,38 @@ class StudentSelfSubmissionsTests(APITestCase):
     # Tests concerning submission data
     def test_a_student_submissions_contains_type_name(self):
         self.assertEqual(
-            self.submission_list_first_entry['typeName'],
-            self.student.submissions.first().type.name)
+            self.submission_list_first_entry['type']['name'],
+            self.student_info.submissions.first().type.name)
 
     def test_a_student_submissions_contains_type_id(self):
         self.assertEqual(
-            self.submission_list_first_entry['typeId'],
-            self.student.submissions.first().type.id)
+            self.submission_list_first_entry['type']['id'],
+            self.student_info.submissions.first().type.id)
 
     def test_submission_data_contains_full_score(self):
         self.assertEqual(
-            self.submission_list_first_entry['fullScore'],
-            self.student.submissions.first().type.full_score)
+            self.submission_list_first_entry['type']['fullScore'],
+            self.student_info.submissions.first().type.full_score)
 
-    def test_submission_data_contains_text(self):
+    def test_submission_data_contains_description(self):
         self.assertEqual(
-            self.submission_list_first_entry['text'],
-            self.student.submissions.first().text)
+            self.submission_list_first_entry['type']['description'],
+            self.student_info.submissions.first().type.description)
 
-    def test_submission_data_contains_feedback_score(self):
+    def test_submission_data_contains_solution(self):
+        self.assertEqual(
+            self.submission_list_first_entry['type']['solution'],
+            self.student_info.submissions.first().type.solution)
+
+    def test_submission_data_contains_final_status(self):
         self.assertEqual(
-            self.submission_list_first_entry['score'],
-            self.student.submissions.first().feedback.score)
+            self.submission_list_first_entry['feedback']['isFinal'],
+            self.student_info.submissions.first().feedback.is_final)
 
-    def test_submission_data_contains_feedback_text(self):
+    def test_submission_data_contains_feedback_score(self):
         self.assertEqual(
-            self.submission_list_first_entry['feedback'],
-            self.student.submissions.first().feedback.text)
+            self.submission_list_first_entry['feedback']['score'],
+            self.student_info.submissions.first().feedback.score)
 
     # We don't want a matriculation number here
     def test_matriculation_number_is_not_send(self):