include new fields on teacher/school serializer

then update tests to handle those new fields

Author: jtrain

tests/serializers.py

@@ -18,17 +18,15 @@ class TeacherSerializer(DynamicFieldsMixin, serializers.ModelSerializer):
 
     class Meta:
         model = Teacher
-        fields = ('id', 'request_info')
+        fields = ("id", "request_info", "age", "name")
 
     def get_request_info(self, teacher):
         """
         a meaningless method that attempts
         to access the request object.
         """
-        request = self.context['request']
-        return request.build_absolute_uri(
-            '/api/v1/teacher/{}'.format(teacher.pk)
-        )
+        request = self.context["request"]
+        return request.build_absolute_uri("/api/v1/teacher/{}".format(teacher.pk))
 
 
 class SchoolSerializer(DynamicFieldsMixin, serializers.ModelSerializer):
@@ -41,4 +39,4 @@ class SchoolSerializer(DynamicFieldsMixin, serializers.ModelSerializer):
 
     class Meta:
         model = School
-        fields = ('id', 'teachers')
+        fields = ("id", "teachers", "name")

tests/test_mixins.py

@@ -38,7 +38,9 @@ def test_fields_left_alone(self):
         request = rf.get("/api/v1/schools/1/")
         serializer = TeacherSerializer(context={"request": request})
 
-        self.assertEqual(set(serializer.fields.keys()), set(("id", "request_info")))
+        self.assertEqual(
+            set(serializer.fields.keys()), set(("id", "request_info", "age", "name"))
+        )
 
     def test_fields_all_gone(self):
         """
@@ -55,12 +57,12 @@ def test_ordinary_serializer(self):
         Check the full JSON output of the serializer.
         """
         rf = RequestFactory()
-        request = rf.get("/api/v1/schools/1/?fields=id")
+        request = rf.get("/api/v1/schools/1/?fields=id,age")
         teacher = Teacher.objects.create(name="Susan", age=34)
 
         serializer = TeacherSerializer(teacher, context={"request": request})
 
-        self.assertEqual(serializer.data, {"id": teacher.id})
+        self.assertEqual(serializer.data, {"id": teacher.id, "age": teacher.age})
 
     def test_omit(self):
         """
@@ -70,7 +72,7 @@ def test_omit(self):
         request = rf.get("/api/v1/schools/1/?omit=request_info")
         serializer = TeacherSerializer(context={"request": request})
 
-        self.assertEqual(set(serializer.fields.keys()), set(("id",)))
+        self.assertEqual(set(serializer.fields.keys()), set(("id", "name", "age")))
 
     def test_omit_and_fields_used(self):
         """
@@ -87,7 +89,7 @@ def test_omit_everything(self):
         Can remove it all tediously.
         """
         rf = RequestFactory()
-        request = rf.get("/api/v1/schools/1/?omit=id,request_info")
+        request = rf.get("/api/v1/schools/1/?omit=id,request_info,age,name")
         serializer = TeacherSerializer(context={"request": request})
 
         self.assertEqual(set(serializer.fields.keys()), set())
@@ -100,14 +102,18 @@ def test_omit_nothing(self):
         request = rf.get("/api/v1/schools/1/?omit")
         serializer = TeacherSerializer(context={"request": request})
 
-        self.assertEqual(set(serializer.fields.keys()), set(("id", "request_info")))
+        self.assertEqual(
+            set(serializer.fields.keys()), set(("id", "request_info", "name", "age"))
+        )
 
     def test_omit_non_existant_field(self):
         rf = RequestFactory()
         request = rf.get("/api/v1/schools/1/?omit=pretend")
         serializer = TeacherSerializer(context={"request": request})
 
-        self.assertEqual(set(serializer.fields.keys()), set(("id", "request_info")))
+        self.assertEqual(
+            set(serializer.fields.keys()), set(("id", "request_info", "name", "age"))
+        )
 
     def test_as_nested_serializer(self):
         """
@@ -135,12 +141,16 @@ def test_as_nested_serializer(self):
                         [
                             ("id", teachers[0].id),
                             ("request_info", request_info.format(teachers[0].id)),
+                            ("age", teachers[0].age),
+                            ("name", teachers[0].name),
                         ]
                     ),
                     OrderedDict(
                         [
                             ("id", teachers[1].id),
                             ("request_info", request_info.format(teachers[1].id)),
+                            ("age", teachers[1].age),
+                            ("name", teachers[1].name),
                         ]
                     ),
                 ],