aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/tests/serializer.py
diff options
context:
space:
mode:
authorMichal Dvorak (cen38289)2012-12-04 14:16:45 +0100
committerMichal Dvorak (cen38289)2012-12-04 14:22:41 +0100
commit2a82b64963792b353a7a2634c003692bd4957c9f (patch)
treef03cf66f90add0305ac0b52304fd9fca6aca059c /rest_framework/tests/serializer.py
parenta7849157bcfb8eb07b0ac934ae7c49a965bf6875 (diff)
downloaddjango-rest-framework-2a82b64963792b353a7a2634c003692bd4957c9f.tar.bz2
Moved smart_unicode to Field ctor, to mimic Django Forms behavior.
Diffstat (limited to 'rest_framework/tests/serializer.py')
-rw-r--r--rest_framework/tests/serializer.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 76c9c465..44adf92e 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -659,13 +659,13 @@ class FieldLabelTest(TestCase):
serializer = self.serializer_class()
text_field = serializer.fields['text']
- self.assertEquals('Text', text_field.label)
- self.assertEquals('Text description.', text_field.help_text)
+ self.assertEquals(u'Text', text_field.label)
+ self.assertEquals(u'Text description.', text_field.help_text)
def test_field_ctor(self):
"""
This is check that ctor supports both label and help_text.
"""
- fields.Field(label='Label', help_text='Help')
- fields.CharField(label='Label', help_text='Help')
- fields.ManyHyperlinkedRelatedField(view_name='fake', label='Label', help_text='Help')
+ self.assertEquals(u'Label', fields.Field(label='Label', help_text='Help').label)
+ self.assertEquals(u'Help', fields.CharField(label='Label', help_text='Help').help_text)
+ self.assertEquals(u'Label', fields.ManyHyperlinkedRelatedField(view_name='fake', label='Label', help_text='Help').label)