aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_fields.py
diff options
context:
space:
mode:
authorTom Christie2014-11-19 14:04:31 +0000
committerTom Christie2014-11-19 14:04:31 +0000
commitbc83dfece460b6639d915bd8fb42b3701cd91172 (patch)
tree7616b21fd6d02caef557be43a12e8d7979ee4997 /tests/test_fields.py
parentf269826a7d8a980536ffbce369be369c4df58d23 (diff)
parent51b7033e4aeeefe19012a77b09a0b23d4a52a5bc (diff)
downloaddjango-rest-framework-bc83dfece460b6639d915bd8fb42b3701cd91172.tar.bz2
Merge branch 'master' into 3.0-beta
Diffstat (limited to 'tests/test_fields.py')
-rw-r--r--tests/test_fields.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/test_fields.py b/tests/test_fields.py
index 5db381ac..13525632 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -793,7 +793,8 @@ class TestChoiceField(FieldValues):
'amazing': ['`amazing` is not a valid choice.']
}
outputs = {
- 'good': 'good'
+ 'good': 'good',
+ '': ''
}
field = serializers.ChoiceField(
choices=[