Merge pull request #2762 from charettes/metadata-null-boolean-field

Metadata should detect null boolean field type.
encode · Mar 25, 2015 · ac77a56 · ac77a56
2 parents 197027c + 8720802
commit ac77a56
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/rest_framework/metadata.py b/rest_framework/metadata.py
@@ -36,6 +36,7 @@ class SimpleMetadata(BaseMetadata):
     label_lookup = ClassLookupDict({
         serializers.Field: 'field',
         serializers.BooleanField: 'boolean',
+        serializers.NullBooleanField: 'boolean',
         serializers.CharField: 'string',
         serializers.URLField: 'url',
         serializers.EmailField: 'email',

diff --git a/tests/test_metadata.py b/tests/test_metadata.py
@@ -1,5 +1,5 @@
 from __future__ import unicode_literals
-from rest_framework import exceptions, serializers, status, views, versioning
+from rest_framework import exceptions, metadata, serializers, status, views, versioning
 from rest_framework.request import Request
 from rest_framework.renderers import BrowsableAPIRenderer
 from rest_framework.test import APIRequestFactory
@@ -207,3 +207,8 @@ def get_serializer(self):
         scheme = versioning.QueryParameterVersioning
         view = ExampleView.as_view(versioning_class=scheme)
         view(request=request)
+
+    def test_null_boolean_field_info_type(self):
+        options = metadata.SimpleMetadata()
+        field_info = options.get_field_info(serializers.NullBooleanField())
+        assert field_info['type'] == 'boolean'