Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-rest-framework
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
django-rest-framework
Commits
c0f4dfd8
Commit
c0f4dfd8
authored
Jun 29, 2016
by
Vadim
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add tests for the ListSerializer for the TestSerializerPartialUsage.
Additional fix partial update for the ListSerializer.
parent
53a1205d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
215 additions
and
1 deletions
+215
-1
rest_framework/serializers.py
+1
-1
tests/test_serializer_lists.py
+214
-0
No files found.
rest_framework/serializers.py
View file @
c0f4dfd8
...
@@ -588,7 +588,7 @@ class ListSerializer(BaseSerializer):
...
@@ -588,7 +588,7 @@ class ListSerializer(BaseSerializer):
})
})
if
not
self
.
allow_empty
and
len
(
data
)
==
0
:
if
not
self
.
allow_empty
and
len
(
data
)
==
0
:
if
self
.
partial
:
if
self
.
par
ent
and
self
.
par
tial
:
raise
SkipField
()
raise
SkipField
()
message
=
self
.
error_messages
[
'empty'
]
message
=
self
.
error_messages
[
'empty'
]
...
...
tests/test_serializer_lists.py
View file @
c0f4dfd8
...
@@ -318,3 +318,217 @@ class TestSerializerPartialUsage:
...
@@ -318,3 +318,217 @@ class TestSerializerPartialUsage:
assert
serializer
.
is_valid
()
assert
serializer
.
is_valid
()
assert
serializer
.
validated_data
==
{}
assert
serializer
.
validated_data
==
{}
assert
serializer
.
errors
==
{}
assert
serializer
.
errors
==
{}
def
test_allow_empty_true
(
self
):
class
ListSerializer
(
serializers
.
Serializer
):
update_field
=
serializers
.
IntegerField
()
store_field
=
serializers
.
IntegerField
()
instance
=
[
{
'update_field'
:
11
,
'store_field'
:
12
},
{
'update_field'
:
21
,
'store_field'
:
22
},
]
serializer
=
ListSerializer
(
instance
,
data
=
[],
partial
=
True
,
many
=
True
)
assert
serializer
.
is_valid
()
assert
serializer
.
validated_data
==
[]
assert
serializer
.
errors
==
[]
def
test_update_allow_empty_true
(
self
):
class
ListSerializer
(
serializers
.
Serializer
):
update_field
=
serializers
.
IntegerField
()
store_field
=
serializers
.
IntegerField
()
instance
=
[
{
'update_field'
:
11
,
'store_field'
:
12
},
{
'update_field'
:
21
,
'store_field'
:
22
},
]
input_data
=
[{
'update_field'
:
31
},
{
'update_field'
:
41
}]
updated_data_list
=
[
{
'update_field'
:
31
,
'store_field'
:
12
},
{
'update_field'
:
41
,
'store_field'
:
22
},
]
serializer
=
ListSerializer
(
instance
,
data
=
input_data
,
partial
=
True
,
many
=
True
)
assert
serializer
.
is_valid
()
for
index
,
data
in
enumerate
(
serializer
.
validated_data
):
for
key
,
value
in
data
.
items
():
assert
value
==
updated_data_list
[
index
][
key
]
assert
serializer
.
errors
==
[]
def
test_allow_empty_false
(
self
):
class
ListSerializer
(
serializers
.
Serializer
):
update_field
=
serializers
.
IntegerField
()
store_field
=
serializers
.
IntegerField
()
instance
=
[
{
'update_field'
:
11
,
'store_field'
:
12
},
{
'update_field'
:
21
,
'store_field'
:
22
},
]
serializer
=
ListSerializer
(
instance
,
data
=
[],
allow_empty
=
False
,
partial
=
True
,
many
=
True
)
assert
not
serializer
.
is_valid
()
assert
serializer
.
validated_data
==
[]
assert
len
(
serializer
.
errors
)
==
1
assert
serializer
.
errors
[
'non_field_errors'
]
==
[
u'This list may not be empty.'
]
def
test_update_allow_empty_false
(
self
):
class
ListSerializer
(
serializers
.
Serializer
):
update_field
=
serializers
.
IntegerField
()
store_field
=
serializers
.
IntegerField
()
instance
=
[
{
'update_field'
:
11
,
'store_field'
:
12
},
{
'update_field'
:
21
,
'store_field'
:
22
},
]
input_data
=
[{
'update_field'
:
31
},
{
'update_field'
:
41
}]
updated_data_list
=
[
{
'update_field'
:
31
,
'store_field'
:
12
},
{
'update_field'
:
41
,
'store_field'
:
22
},
]
serializer
=
ListSerializer
(
instance
,
data
=
input_data
,
allow_empty
=
False
,
partial
=
True
,
many
=
True
)
assert
serializer
.
is_valid
()
for
index
,
data
in
enumerate
(
serializer
.
validated_data
):
for
key
,
value
in
data
.
items
():
assert
value
==
updated_data_list
[
index
][
key
]
assert
serializer
.
errors
==
[]
def
test_as_field_allow_empty_true
(
self
):
class
ListSerializer
(
serializers
.
Serializer
):
update_field
=
serializers
.
IntegerField
()
store_field
=
serializers
.
IntegerField
()
class
Serializer
(
serializers
.
Serializer
):
extra_field
=
serializers
.
IntegerField
()
list_field
=
ListSerializer
(
many
=
True
)
instance
=
{
'extra_field'
:
1
,
'list_field'
:
[
{
'update_field'
:
11
,
'store_field'
:
12
},
{
'update_field'
:
21
,
'store_field'
:
22
},
]
}
serializer
=
Serializer
(
instance
,
data
=
{},
partial
=
True
)
assert
serializer
.
is_valid
()
assert
serializer
.
validated_data
==
{}
assert
serializer
.
errors
==
{}
def
test_udate_as_field_allow_empty_true
(
self
):
class
ListSerializer
(
serializers
.
Serializer
):
update_field
=
serializers
.
IntegerField
()
store_field
=
serializers
.
IntegerField
()
class
Serializer
(
serializers
.
Serializer
):
extra_field
=
serializers
.
IntegerField
()
list_field
=
ListSerializer
(
many
=
True
)
instance
=
{
'extra_field'
:
1
,
'list_field'
:
[
{
'update_field'
:
11
,
'store_field'
:
12
},
{
'update_field'
:
21
,
'store_field'
:
22
},
]
}
input_data_1
=
{
'extra_field'
:
2
}
input_data_2
=
{
'list_field'
:
[
{
'update_field'
:
31
},
{
'update_field'
:
41
},
]
}
# data_1
serializer
=
Serializer
(
instance
,
data
=
input_data_1
,
partial
=
True
)
assert
serializer
.
is_valid
()
assert
len
(
serializer
.
validated_data
)
==
1
assert
serializer
.
validated_data
[
'extra_field'
]
==
2
assert
serializer
.
errors
==
{}
# data_2
serializer
=
Serializer
(
instance
,
data
=
input_data_2
,
partial
=
True
)
assert
serializer
.
is_valid
()
updated_data_list
=
[
{
'update_field'
:
31
,
'store_field'
:
12
},
{
'update_field'
:
41
,
'store_field'
:
22
},
]
for
index
,
data
in
enumerate
(
serializer
.
validated_data
[
'list_field'
]):
for
key
,
value
in
data
.
items
():
assert
value
==
updated_data_list
[
index
][
key
]
assert
serializer
.
errors
==
{}
def
test_as_field_allow_empty_false
(
self
):
class
ListSerializer
(
serializers
.
Serializer
):
update_field
=
serializers
.
IntegerField
()
store_field
=
serializers
.
IntegerField
()
class
Serializer
(
serializers
.
Serializer
):
extra_field
=
serializers
.
IntegerField
()
list_field
=
ListSerializer
(
many
=
True
,
allow_empty
=
False
)
instance
=
{
'extra_field'
:
1
,
'list_field'
:
[
{
'update_field'
:
11
,
'store_field'
:
12
},
{
'update_field'
:
21
,
'store_field'
:
22
},
]
}
serializer
=
Serializer
(
instance
,
data
=
{},
partial
=
True
)
assert
serializer
.
is_valid
()
assert
serializer
.
validated_data
==
{}
assert
serializer
.
errors
==
{}
def
test_update_as_field_allow_empty_false
(
self
):
class
ListSerializer
(
serializers
.
Serializer
):
update_field
=
serializers
.
IntegerField
()
store_field
=
serializers
.
IntegerField
()
class
Serializer
(
serializers
.
Serializer
):
extra_field
=
serializers
.
IntegerField
()
list_field
=
ListSerializer
(
many
=
True
,
allow_empty
=
False
)
instance
=
{
'extra_field'
:
1
,
'list_field'
:
[
{
'update_field'
:
11
,
'store_field'
:
12
},
{
'update_field'
:
21
,
'store_field'
:
22
},
]
}
input_data_1
=
{
'extra_field'
:
2
}
input_data_2
=
{
'list_field'
:
[
{
'update_field'
:
31
},
{
'update_field'
:
41
},
]
}
updated_data_list
=
[
{
'update_field'
:
31
,
'store_field'
:
12
},
{
'update_field'
:
41
,
'store_field'
:
22
},
]
# data_1
serializer
=
Serializer
(
instance
,
data
=
input_data_1
,
partial
=
True
)
assert
serializer
.
is_valid
()
assert
serializer
.
errors
==
{}
# data_2
serializer
=
Serializer
(
instance
,
data
=
input_data_2
,
partial
=
True
)
assert
serializer
.
is_valid
()
for
index
,
data
in
enumerate
(
serializer
.
validated_data
[
'list_field'
]):
for
key
,
value
in
data
.
items
():
assert
value
==
updated_data_list
[
index
][
key
]
assert
serializer
.
errors
==
{}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment