aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/tests
diff options
context:
space:
mode:
authorTom Christie2014-05-20 16:03:51 +0100
committerTom Christie2014-05-20 16:03:51 +0100
commit218b94e60696de649407f9292359e02e5daa787d (patch)
treeec3704334b5ed9436e0a1cc45eb463dd1f6302e0 /rest_framework/tests
parentd46d153a9979a96fae643a24286eacaf5c219401 (diff)
parent1e7b5fd2c04e587e30cf29e15ca3074b8d33b92e (diff)
downloaddjango-rest-framework-218b94e60696de649407f9292359e02e5daa787d.tar.bz2
Merge pull request #1536 from Ian-Foote/choicefield_blank_display_value
Allow customising ChoiceField blank display value
Diffstat (limited to 'rest_framework/tests')
-rw-r--r--rest_framework/tests/test_fields.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/rest_framework/tests/test_fields.py b/rest_framework/tests/test_fields.py
index 3ae1c438..b04b947f 100644
--- a/rest_framework/tests/test_fields.py
+++ b/rest_framework/tests/test_fields.py
@@ -717,6 +717,15 @@ class ChoiceFieldTests(TestCase):
f = serializers.ChoiceField(required=False, choices=SAMPLE_CHOICES)
self.assertEqual(f.choices, models.fields.BLANK_CHOICE_DASH + SAMPLE_CHOICES)
+ def test_blank_choice_display(self):
+ blank = 'No Preference'
+ f = serializers.ChoiceField(
+ required=False,
+ choices=SAMPLE_CHOICES,
+ blank_display_value=blank,
+ )
+ self.assertEqual(f.choices, [('', blank)] + SAMPLE_CHOICES)
+
def test_invalid_choice_model(self):
s = ChoiceFieldModelSerializer(data={'choice': 'wrong_value'})
self.assertFalse(s.is_valid())