From 252ccf1e6bb28e7b25ac450bbefebd59efd92c9e Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 2 Jun 2016 12:33:34 +0100
Subject: [PATCH] Add Meta.fields = '__all__' to serializer classes where
 required.

---
 tests/test_filters.py                |  5 +++++
 tests/test_generics.py               |  4 ++++
 tests/test_metadata.py               |  1 +
 tests/test_model_serializer.py       | 21 +++++++++++++++++++++
 tests/test_multitable_inheritance.py |  2 ++
 tests/test_permissions.py            |  2 ++
 tests/test_relations_slug.py         |  3 +++
 tests/test_response.py               |  1 +
 tests/test_validation.py             |  1 +
 tests/test_validators.py             |  5 +++++
 10 files changed, 45 insertions(+)

diff --git a/tests/test_filters.py b/tests/test_filters.py
index fd71764f7..8c3517728 100644
--- a/tests/test_filters.py
+++ b/tests/test_filters.py
@@ -26,6 +26,7 @@ if django_filters:
     class FilterableItemSerializer(serializers.ModelSerializer):
         class Meta:
             model = FilterableItem
+            fields = '__all__'
 
     # Basic filter on a list view.
     class FilterFieldsRootView(generics.ListCreateAPIView):
@@ -336,6 +337,7 @@ class SearchFilterModel(models.Model):
 class SearchFilterSerializer(serializers.ModelSerializer):
     class Meta:
         model = SearchFilterModel
+        fields = '__all__'
 
 
 class SearchFilterTests(TestCase):
@@ -461,6 +463,7 @@ class SearchFilterModelM2M(models.Model):
 class SearchFilterM2MSerializer(serializers.ModelSerializer):
     class Meta:
         model = SearchFilterModelM2M
+        fields = '__all__'
 
 
 class SearchFilterM2MTests(TestCase):
@@ -511,6 +514,7 @@ class OrderingFilterRelatedModel(models.Model):
 class OrderingFilterSerializer(serializers.ModelSerializer):
     class Meta:
         model = OrderingFilterModel
+        fields = '__all__'
 
 
 class DjangoFilterOrderingModel(models.Model):
@@ -524,6 +528,7 @@ class DjangoFilterOrderingModel(models.Model):
 class DjangoFilterOrderingSerializer(serializers.ModelSerializer):
     class Meta:
         model = DjangoFilterOrderingModel
+        fields = '__all__'
 
 
 class DjangoFilterOrderingTests(TestCase):
diff --git a/tests/test_generics.py b/tests/test_generics.py
index 2e47df50f..247237584 100644
--- a/tests/test_generics.py
+++ b/tests/test_generics.py
@@ -33,11 +33,13 @@ class Comment(RESTFrameworkModel):
 class BasicSerializer(serializers.ModelSerializer):
     class Meta:
         model = BasicModel
+        fields = '__all__'
 
 
 class ForeignKeySerializer(serializers.ModelSerializer):
     class Meta:
         model = ForeignKeySource
+        fields = '__all__'
 
 
 class SlugSerializer(serializers.ModelSerializer):
@@ -414,6 +416,7 @@ class ClassASerializer(serializers.ModelSerializer):
 
     class Meta:
         model = ClassA
+        fields = '__all__'
 
 
 class ExampleView(generics.ListCreateAPIView):
@@ -461,6 +464,7 @@ class DynamicSerializerView(generics.ListCreateAPIView):
             class DynamicSerializer(serializers.ModelSerializer):
                 class Meta:
                     model = TwoFieldModel
+                    fields = '__all__'
         return DynamicSerializer
 
 
diff --git a/tests/test_metadata.py b/tests/test_metadata.py
index 109dd3f7c..7a02c2a3d 100644
--- a/tests/test_metadata.py
+++ b/tests/test_metadata.py
@@ -300,6 +300,7 @@ class TestModelSerializerMetadata(TestCase):
 
             class Meta:
                 model = Parent
+                fields = '__all__'
 
         class ExampleView(views.APIView):
             """Example view."""
diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py
index 185130778..90d1a6ead 100644
--- a/tests/test_model_serializer.py
+++ b/tests/test_model_serializer.py
@@ -141,6 +141,7 @@ class TestRegularFieldMappings(TestCase):
         class TestSerializer(serializers.ModelSerializer):
             class Meta:
                 model = RegularFieldsModel
+                fields = '__all__'
 
         expected = dedent("""
             TestSerializer():
@@ -173,6 +174,7 @@ class TestRegularFieldMappings(TestCase):
         class TestSerializer(serializers.ModelSerializer):
             class Meta:
                 model = FieldOptionsModel
+                fields = '__all__'
 
         expected = dedent("""
             TestSerializer():
@@ -306,6 +308,7 @@ class TestRegularFieldMappings(TestCase):
 
             class Meta:
                 model = RegularFieldsModel
+                fields = '__all__'
 
         class ChildSerializer(TestSerializer):
             missing = serializers.ReadOnlyField()
@@ -320,6 +323,7 @@ class TestRegularFieldMappings(TestCase):
         class ExampleSerializer(serializers.ModelSerializer):
             class Meta:
                 model = ChoicesModel
+                fields = '__all__'
 
         ExampleSerializer()
 
@@ -327,6 +331,7 @@ class TestRegularFieldMappings(TestCase):
         class ImplicitFieldsSerializer(serializers.ModelSerializer):
             class Meta:
                 model = RegularFieldsModel
+                fields = '__all__'
 
         class ExplicitFieldsSerializer(serializers.ModelSerializer):
             class Meta:
@@ -350,6 +355,7 @@ class TestDurationFieldMapping(TestCase):
         class TestSerializer(serializers.ModelSerializer):
             class Meta:
                 model = DurationFieldModel
+                fields = '__all__'
 
         expected = dedent("""
             TestSerializer():
@@ -367,6 +373,7 @@ class TestGenericIPAddressFieldValidation(TestCase):
         class TestSerializer(serializers.ModelSerializer):
             class Meta:
                 model = IPAddressFieldModel
+                fields = '__all__'
 
         s = TestSerializer(data={'address': 'not an ip address'})
         self.assertFalse(s.is_valid())
@@ -420,6 +427,7 @@ class TestRelationalFieldMappings(TestCase):
         class TestSerializer(serializers.ModelSerializer):
             class Meta:
                 model = RelationalModel
+                fields = '__all__'
 
         expected = dedent("""
             TestSerializer():
@@ -436,6 +444,7 @@ class TestRelationalFieldMappings(TestCase):
             class Meta:
                 model = RelationalModel
                 depth = 1
+                fields = '__all__'
 
         expected = dedent("""
             TestSerializer():
@@ -459,6 +468,7 @@ class TestRelationalFieldMappings(TestCase):
         class TestSerializer(serializers.HyperlinkedModelSerializer):
             class Meta:
                 model = RelationalModel
+                fields = '__all__'
 
         expected = dedent("""
             TestSerializer():
@@ -475,6 +485,7 @@ class TestRelationalFieldMappings(TestCase):
             class Meta:
                 model = RelationalModel
                 depth = 1
+                fields = '__all__'
 
         expected = dedent("""
             TestSerializer():
@@ -499,6 +510,8 @@ class TestRelationalFieldMappings(TestCase):
             class Meta:
                 model = UniqueTogetherModel
                 depth = 1
+                fields = '__all__'
+
         expected = dedent("""
             TestSerializer():
                 url = HyperlinkedIdentityField(view_name='uniquetogethermodel-detail')
@@ -600,6 +613,7 @@ class TestRelationalFieldDisplayValue(TestCase):
         class TestSerializer(serializers.ModelSerializer):
             class Meta:
                 model = DisplayValueModel
+                fields = '__all__'
 
         serializer = TestSerializer()
         expected = OrderedDict([('1', 'Red Color'), ('2', 'Yellow Color'), ('3', 'Green Color')])
@@ -615,6 +629,7 @@ class TestRelationalFieldDisplayValue(TestCase):
 
             class Meta:
                 model = DisplayValueModel
+                fields = '__all__'
 
         serializer = TestSerializer()
         expected = OrderedDict([('1', 'My Red Color'), ('2', 'My Yellow Color'), ('3', 'My Green Color')])
@@ -645,6 +660,7 @@ class TestIntegration(TestCase):
         class TestSerializer(serializers.ModelSerializer):
             class Meta:
                 model = RelationalModel
+                fields = '__all__'
 
         serializer = TestSerializer(self.instance)
         expected = {
@@ -660,6 +676,7 @@ class TestIntegration(TestCase):
         class TestSerializer(serializers.ModelSerializer):
             class Meta:
                 model = RelationalModel
+                fields = '__all__'
 
         new_foreign_key = ForeignKeyTargetModel.objects.create(
             name='foreign_key'
@@ -707,6 +724,7 @@ class TestIntegration(TestCase):
         class TestSerializer(serializers.ModelSerializer):
             class Meta:
                 model = RelationalModel
+                fields = '__all__'
 
         new_foreign_key = ForeignKeyTargetModel.objects.create(
             name='foreign_key'
@@ -875,6 +893,7 @@ class TestDecimalFieldMappings(TestCase):
         class TestSerializer(serializers.ModelSerializer):
             class Meta:
                 model = DecimalFieldModel
+                fields = '__all__'
 
         serializer = TestSerializer()
 
@@ -888,6 +907,7 @@ class TestDecimalFieldMappings(TestCase):
         class TestSerializer(serializers.ModelSerializer):
             class Meta:
                 model = DecimalFieldModel
+                fields = '__all__'
 
         serializer = TestSerializer()
 
@@ -901,6 +921,7 @@ class TestDecimalFieldMappings(TestCase):
         class TestSerializer(serializers.ModelSerializer):
             class Meta:
                 model = DecimalFieldModel
+                fields = '__all__'
 
         serializer = TestSerializer()
 
diff --git a/tests/test_multitable_inheritance.py b/tests/test_multitable_inheritance.py
index 340d4966a..643d8f738 100644
--- a/tests/test_multitable_inheritance.py
+++ b/tests/test_multitable_inheritance.py
@@ -25,11 +25,13 @@ class AssociatedModel(RESTFrameworkModel):
 class DerivedModelSerializer(serializers.ModelSerializer):
     class Meta:
         model = ChildModel
+        fields = '__all__'
 
 
 class AssociatedModelSerializer(serializers.ModelSerializer):
     class Meta:
         model = AssociatedModel
+        fields = '__all__'
 
 
 # Tests
diff --git a/tests/test_permissions.py b/tests/test_permissions.py
index e04c72ec9..5cef22628 100644
--- a/tests/test_permissions.py
+++ b/tests/test_permissions.py
@@ -24,6 +24,7 @@ factory = APIRequestFactory()
 class BasicSerializer(serializers.ModelSerializer):
     class Meta:
         model = BasicModel
+        fields = '__all__'
 
 
 class RootView(generics.ListCreateAPIView):
@@ -215,6 +216,7 @@ class BasicPermModel(models.Model):
 class BasicPermSerializer(serializers.ModelSerializer):
     class Meta:
         model = BasicPermModel
+        fields = '__all__'
 
 
 # Custom object-level permission, that includes 'view' permissions
diff --git a/tests/test_relations_slug.py b/tests/test_relations_slug.py
index 680aee417..1e1bdaa62 100644
--- a/tests/test_relations_slug.py
+++ b/tests/test_relations_slug.py
@@ -15,6 +15,7 @@ class ForeignKeyTargetSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = ForeignKeyTarget
+        fields = '__all__'
 
 
 class ForeignKeySourceSerializer(serializers.ModelSerializer):
@@ -25,6 +26,7 @@ class ForeignKeySourceSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = ForeignKeySource
+        fields = '__all__'
 
 
 class NullableForeignKeySourceSerializer(serializers.ModelSerializer):
@@ -36,6 +38,7 @@ class NullableForeignKeySourceSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = NullableForeignKeySource
+        fields = '__all__'
 
 
 # TODO: M2M Tests, FKTests (Non-nullable), One2One
diff --git a/tests/test_response.py b/tests/test_response.py
index c8ae6475a..33c51e773 100644
--- a/tests/test_response.py
+++ b/tests/test_response.py
@@ -18,6 +18,7 @@ from tests.models import BasicModel
 class BasicModelSerializer(serializers.ModelSerializer):
     class Meta:
         model = BasicModel
+        fields = '__all__'
 
 
 class MockPickleRenderer(BaseRenderer):
diff --git a/tests/test_validation.py b/tests/test_validation.py
index b6f274219..ab04d59e6 100644
--- a/tests/test_validation.py
+++ b/tests/test_validation.py
@@ -125,6 +125,7 @@ class ValidationMaxValueValidatorModel(models.Model):
 class ValidationMaxValueValidatorModelSerializer(serializers.ModelSerializer):
     class Meta:
         model = ValidationMaxValueValidatorModel
+        fields = '__all__'
 
 
 class UpdateMaxValueValidationModel(generics.RetrieveUpdateDestroyAPIView):
diff --git a/tests/test_validators.py b/tests/test_validators.py
index 67156f31c..9b388951e 100644
--- a/tests/test_validators.py
+++ b/tests/test_validators.py
@@ -21,6 +21,7 @@ class UniquenessModel(models.Model):
 class UniquenessSerializer(serializers.ModelSerializer):
     class Meta:
         model = UniquenessModel
+        fields = '__all__'
 
 
 class RelatedModel(models.Model):
@@ -44,6 +45,7 @@ class AnotherUniquenessModel(models.Model):
 class AnotherUniquenessSerializer(serializers.ModelSerializer):
     class Meta:
         model = AnotherUniquenessModel
+        fields = '__all__'
 
 
 class TestUniquenessValidation(TestCase):
@@ -134,11 +136,13 @@ class NullUniquenessTogetherModel(models.Model):
 class UniquenessTogetherSerializer(serializers.ModelSerializer):
     class Meta:
         model = UniquenessTogetherModel
+        fields = '__all__'
 
 
 class NullUniquenessTogetherSerializer(serializers.ModelSerializer):
     class Meta:
         model = NullUniquenessTogetherModel
+        fields = '__all__'
 
 
 class TestUniquenessTogetherValidation(TestCase):
@@ -275,6 +279,7 @@ class UniqueForDateModel(models.Model):
 class UniqueForDateSerializer(serializers.ModelSerializer):
     class Meta:
         model = UniqueForDateModel
+        fields = '__all__'
 
 
 class TestUniquenessForDateValidation(TestCase):