encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-08 06:14:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add an explicit name to the models.

Browse Source 
Otherwise we'll get a conflict between tests.test_model_serializer.ParentModel and tests.test_multitable_inheritance.ParentModel.
This commit is contained in:
Xavier Ordoquy 2016-01-21 12:49:10 +01:00
parent 15ec87ce7b
commit e670284f07
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/test_model_serializer.py
View File

@ -91,12 +91,12 @@ class ChoicesModel(models.Model):
choices_field_with_nonstandard_args = models.DecimalField(max_digits=3, decimal_places=1, choices=DECIMAL_CHOICES, verbose_name='A label') choices_field_with_nonstandard_args = models.DecimalField(max_digits=3, decimal_places=1, choices=DECIMAL_CHOICES, verbose_name='A label')
class ParentModel(models.Model): class Issue3674ParentModel(models.Model):
title = models.CharField(max_length=64) title = models.CharField(max_length=64)
class ChildModel(models.Model): class Issue3674ChildModel(models.Model):
parent = models.ForeignKey(ParentModel, related_name='children') parent = models.ForeignKey(Issue3674ParentModel, related_name='children')
value = models.CharField(primary_key=True, max_length=64) value = models.CharField(primary_key=True, max_length=64)
@ -989,22 +989,22 @@ class Issue3674Test(TestCase):
class TestChildModelSerializer(serializers.ModelSerializer): class TestChildModelSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = ChildModel model = Issue3674ChildModel
fields = ('value', 'parent') fields = ('value', 'parent')
class TestParentModelSerializer(serializers.ModelSerializer): class TestParentModelSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = ParentModel model = Issue3674ParentModel
fields = ('id', 'title', 'children') fields = ('id', 'title', 'children')
parent = ParentModel.objects.create(title='abc') parent = Issue3674ParentModel.objects.create(title='abc')
child = ChildModel.objects.create(value='def', parent=parent) child = Issue3674ChildModel.objects.create(value='def', parent=parent)
parent_serializer = TestParentModelSerializer(parent) parent_serializer = TestParentModelSerializer(parent)
child_serializer = TestChildModelSerializer(child) child_serializer = TestChildModelSerializer(child)
parent_expected = {u'children': [u'def'], u'id': 1, u'title': u'abc'} parent_expected = {'children': ['def'], 'id': 1, 'title': 'abc'}
self.assertEqual(parent_serializer.data, parent_expected) self.assertEqual(parent_serializer.data, parent_expected)
child_expected = {u'parent': 1, u'value': u'def'} child_expected = {'parent': 1, 'value': 'def'}
self.assertEqual(child_serializer.data, child_expected) self.assertEqual(child_serializer.data, child_expected)