Tests for field choices

1 files changed, 30 insertions, 28 deletions

diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py
index be72e444..1c718ccb 100644
--- a/rest_framework/utils/field_mapping.py
+++ b/rest_framework/utils/field_mapping.py
@@ -49,8 +49,9 @@ def get_field_kwargs(field_name, model_field):
     kwargs = {}
     validator_kwarg = model_field.validators
 
-    if model_field.null or model_field.blank:
-        kwargs['required'] = False
+    # The following will only be used by ModelField classes.
+    # Gets removed for everything else.
+    kwargs['model_field'] = model_field
 
     if model_field.verbose_name and needs_label(model_field, field_name):
         kwargs['label'] = capfirst(model_field.verbose_name)
@@ -59,23 +60,26 @@ def get_field_kwargs(field_name, model_field):
         kwargs['help_text'] = model_field.help_text
 
     if isinstance(model_field, models.AutoField) or not model_field.editable:
+        # If this field is read-only, then return early.
+        # Further keyword arguments are not valid.
         kwargs['read_only'] = True
-        # Read only implies that the field is not required.
-        # We have a cleaner repr on the instance if we don't set it.
-        kwargs.pop('required', None)
+        return kwargs
 
     if model_field.has_default():
-        kwargs['default'] = model_field.get_default()
-        # Having a default implies that the field is not required.
-        # We have a cleaner repr on the instance if we don't set it.
-        kwargs.pop('required', None)
+        kwargs['required'] = False
 
     if model_field.flatchoices:
-        # If this model field contains choices, then return now,
-        # any further keyword arguments are not valid.
+        # If this model field contains choices, then return early.
+        # Further keyword arguments are not valid.
         kwargs['choices'] = model_field.flatchoices
         return kwargs
 
+    if model_field.null:
+        kwargs['allow_null'] = True
+
+    if model_field.blank:
+        kwargs['allow_blank'] = True
+
     # Ensure that max_length is passed explicitly as a keyword arg,
     # rather than as a validator.
     max_length = getattr(model_field, 'max_length', None)
@@ -88,7 +92,10 @@ def get_field_kwargs(field_name, model_field):
 
     # Ensure that min_length is passed explicitly as a keyword arg,
     # rather than as a validator.
-    min_length = getattr(model_field, 'min_length', None)
+    min_length = next((
+        validator.limit_value for validator in validator_kwarg
+        if isinstance(validator, validators.MinLengthValidator)
+    ), None)
     if min_length is not None:
         kwargs['min_length'] = min_length
         validator_kwarg = [
@@ -153,20 +160,9 @@ def get_field_kwargs(field_name, model_field):
     if decimal_places is not None:
         kwargs['decimal_places'] = decimal_places
 
-    if isinstance(model_field, models.BooleanField):
-        # models.BooleanField has `blank=True`, but *is* actually
-        # required *unless* a default is provided.
-        # Also note that Django<1.6 uses `default=False` for
-        # models.BooleanField, but Django>=1.6 uses `default=None`.
-        kwargs.pop('required', None)
-
     if validator_kwarg:
         kwargs['validators'] = validator_kwarg
 
-    # The following will only be used by ModelField classes.
-    # Gets removed for everything else.
-    kwargs['model_field'] = model_field
-
     return kwargs
 
 
@@ -188,16 +184,22 @@ def get_relation_kwargs(field_name, relation_info):
         kwargs.pop('queryset', None)
 
     if model_field:
-        if model_field.null or model_field.blank:
-            kwargs['required'] = False
         if model_field.verbose_name and needs_label(model_field, field_name):
             kwargs['label'] = capfirst(model_field.verbose_name)
-        if not model_field.editable:
-            kwargs['read_only'] = True
-            kwargs.pop('queryset', None)
         help_text = clean_manytomany_helptext(model_field.help_text)
         if help_text:
             kwargs['help_text'] = help_text
+        if not model_field.editable:
+            kwargs['read_only'] = True
+            kwargs.pop('queryset', None)
+        if kwargs.get('read_only', False):
+            # If this field is read-only, then return early.
+            # No further keyword arguments are valid.
+            return kwargs
+        if model_field.has_default():
+            kwargs['required'] = False
+        if model_field.null:
+            kwargs['allow_null'] = True
 
     return kwargs