encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-22 17:47:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

added tests for form

Browse Source
This commit is contained in:
Oscar Vilaplana 2013-05-18 18:27:53 +02:00
parent 4dffcb5d77
commit fecadacab1
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/fields.py
View File

@ -135,8 +135,7 @@ def humanize_field(field):
"""
humanized = {
'type': (field.type_name if field.type_name
else humanize_field_type(field.form_field_class)),
'type': humanize_field_type(field.__class__),
'required': getattr(field, 'required', False),
'label': field.label,
}
@ -154,7 +153,8 @@ def humanize_form_fields(form):
:return: A dictionary of {field_label: humanized description}
"""
fields = SortedDict([(f.name, humanize_field(f)) for f in form.fields])
fields = SortedDict([(name, humanize_field(field))
for name, field in form.fields.iteritems()])
return fields

23
rest_framework/tests/fields.py
View File

@ -4,7 +4,8 @@ General serializer field tests.
from __future__ import unicode_literals
from django.utils.datastructures import SortedDict
import datetime
from rest_framework.fields import humanize_field, humanize_field_type
from rest_framework.fields import (humanize_field, humanize_field_type,
humanize_form_fields)
from django import forms
from decimal import Decimal
from django.db import models
@ -742,3 +743,23 @@ class HumanizedField(TestCase):
def test_label(self):
for field in (self.required_field, self.optional_field):
self.assertEqual(humanize_field(field)['label'], field.label)
class Form(forms.Form):
field1 = forms.CharField(max_length=3, label='field one')
field2 = forms.CharField(label='field two')
class HumanizedSerializer(TestCase):
def setUp(self):
self.serializer = TimestampedModelSerializer()
def test_humanized(self):
humanized = humanize_form_fields(Form())
self.assertEqual(humanized, {
'field1': {
u'help_text': u'', u'required': True,
u'type': u'Single Character', u'label': 'field one'},
'field2': {
u'help_text': u'', u'required': True,
u'type': u'Single Character', u'label': 'field two'}})