Fixes issue with merge

Author: dalvtor

rest_framework/schemas/openapi.py

@@ -258,9 +258,7 @@ def _map_field(self, field):
         if isinstance(field, serializers.ListField):
             mapping = {
                 'type': 'array',
-                'items': {
-                    "type": self._map_field(field.child).get('type')
-                },
+                'items': {},
             }
             if not isinstance(field.child, _UnvalidatedField):
                 mapping['items'] = {

tests/schemas/test_openapi.py

@@ -43,7 +43,7 @@ class TestFieldMapping(TestCase):
     def test_list_field_mapping(self):
         inspector = AutoSchema()
         cases = [
-            (serializers.ListField(), {'type': 'array'}),
+            (serializers.ListField(), {'items': {}, 'type': 'array'}),
             (serializers.ListField(child=serializers.BooleanField()), {'items': {'type': 'boolean'}, 'type': 'array'}),
             (serializers.ListField(child=serializers.FloatField()), {'items': {'type': 'number'}, 'type': 'array'}),
             (serializers.ListField(child=serializers.CharField()), {'items': {'type': 'string'}, 'type': 'array'}),
@@ -272,31 +272,9 @@ def test_serializer_datefield(self):
         assert response_schema['date']['format'] == 'date'
         assert response_schema['datetime']['format'] == 'date-time'
 
-    def test_serializer_listfield(self):
-        patterns = [
-            url(r'^example/?$', views.ExampleGenericViewSet.as_view({"get": "get"})),
-        ]
-        generator = SchemaGenerator(patterns=patterns)
-
-        request = create_request('/')
-        schema = generator.get_schema(request=request)
-
-        response = schema['paths']['/example/']['get']['responses']
-        response_schema = response['200']['content']['application/json']['schema']['properties']
-
-        assert response_schema['float_list']['type'] == 'array'
-        assert response_schema['float_list']['items']['type'] == 'number'
-
-        assert response_schema['string_list']['type'] == 'array'
-        assert response_schema['string_list']['items']['type'] == 'string'
-
-        assert response_schema['boolean_list']['type'] == 'array'
-        assert response_schema['boolean_list']['items']['type'] == 'boolean'
-        assert response_schema['boolean_list']['default'] == [True, False]
-
     def test_serializer_validators(self):
         patterns = [
-            url(r'^example/?$', views.ExampleValidatedAPIView.as_view()),
+            url(r'^example/?$', views.ExampleValdidatedAPIView.as_view()),
         ]
         generator = SchemaGenerator(patterns=patterns)
 
@@ -343,7 +321,3 @@ def test_serializer_validators(self):
 
         assert response_schema['ip']['type'] == 'string'
         assert 'format' not in response_schema['ip']
-
-        assert response_schema['boolean_list']['type'] == 'array'
-        assert response_schema['boolean_list']['items']['type'] == 'boolean'
-        assert response_schema['boolean_list']['default'] == [True, False]

tests/schemas/views.py

@@ -33,9 +33,6 @@ def get(self, *args, **kwargs):
 class ExampleSerializer(serializers.Serializer):
     date = serializers.DateField()
     datetime = serializers.DateTimeField()
-    float_list = serializers.ListField(child=serializers.FloatField())
-    string_list = serializers.ListField(child=serializers.CharField())
-    boolean_list = serializers.ListField(child=serializers.BooleanField(), default=[True, False])
 
 
 class ExampleGenericAPIView(generics.GenericAPIView):
@@ -100,13 +97,12 @@ class ExampleValidatedSerializer(serializers.Serializer):
     boolean_list = serializers.ListField(child=serializers.BooleanField(), default=[True, False])
 
 
-class ExampleValidatedAPIView(generics.GenericAPIView):
+class ExampleValdidatedAPIView(generics.GenericAPIView):
     serializer_class = ExampleValidatedSerializer
 
     def get(self, *args, **kwargs):
-        serializer = self.get_serializer(
-            integer=33, string='hello', regex='foo', decimal1=3.55, decimal2=5.33,
-            email='[email protected]', url='http://localhost', uuid=uuid.uuid4(), ip4='127.0.0.1',
-            ip6='::1', ip='192.168.1.1', decimal_list=[1.0, 2.5]
-        )
+        serializer = self.get_serializer(integer=33, string='hello', regex='foo', decimal1=3.55,
+                                         decimal2=5.33, email='[email protected]',
+                                         url='http://localhost', uuid=uuid.uuid4(), ip4='127.0.0.1', ip6='::1',
+                                         ip='192.168.1.1')
         return Response(serializer.data)