encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-05-03 23:43:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle empty data with serializer (#4564)

Browse Source
This commit is contained in:
Tom Christie 2016-10-12 10:47:17 +01:00 committed by GitHub
parent 4c9b14bd97
commit b419970431
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rest_framework/serializers.py
View File

@ -507,6 +507,11 @@ class Serializer(BaseSerializer):
@property @property
def errors(self): def errors(self):
ret = super(Serializer, self).errors ret = super(Serializer, self).errors
if isinstance(ret, list) and len(ret) == 1 and ret[0].code == 'null':
# Edge case. Provide a more descriptive error than
# "this field may not be null", when no data is passed.
detail = ErrorDetail('No data provided', code='null')
ret = {api_settings.NON_FIELD_ERRORS_KEY: [detail]}
return ReturnDict(ret, serializer=self) return ReturnDict(ret, serializer=self)
@ -700,6 +705,11 @@ class ListSerializer(BaseSerializer):
@property @property
def errors(self): def errors(self):
ret = super(ListSerializer, self).errors ret = super(ListSerializer, self).errors
if isinstance(ret, list) and len(ret) == 1 and ret[0].code == 'null':
# Edge case. Provide a more descriptive error than
# "this field may not be null", when no data is passed.
detail = ErrorDetail('No data provided', code='null')
ret = {api_settings.NON_FIELD_ERRORS_KEY: [detail]}
if isinstance(ret, dict): if isinstance(ret, dict):
return ReturnDict(ret, serializer=self) return ReturnDict(ret, serializer=self)
return ReturnList(ret, serializer=self) return ReturnList(ret, serializer=self)

6
tests/test_serializer.py
View File

@ -62,6 +62,12 @@ class TestSerializer:
with pytest.raises(AssertionError): with pytest.raises(AssertionError):
serializer.save() serializer.save()
def test_validate_none_data(self):
data = None
serializer = self.Serializer(data=data)
assert not serializer.is_valid()
assert serializer.errors == {'non_field_errors': ['No data provided']}
class TestValidateMethod: class TestValidateMethod:
def test_non_field_error_validate_method(self): def test_non_field_error_validate_method(self):

6
tests/test_serializer_nested.py
View File

@ -41,6 +41,12 @@ class TestNestedSerializer:
serializer = self.Serializer() serializer = self.Serializer()
assert serializer.data == expected_data assert serializer.data == expected_data
def test_nested_serialize_no_data(self):
data = None
serializer = self.Serializer(data=data)
assert not serializer.is_valid()
assert serializer.errors == {'non_field_errors': ['No data provided']}
class TestNotRequiredNestedSerializer: class TestNotRequiredNestedSerializer:
def setup(self): def setup(self):