aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Törnqvist2013-05-18 16:56:26 +0300
committerMarkus Törnqvist2013-05-18 16:56:26 +0300
commite2d3aa65d78511b526ecac24bf4198dfa4f27c16 (patch)
treecc5abe49d38e1316d1052ffbcfa864443f24924a
parente7ddaf5472ba3746da2a0e9dfed6326fc90ce08e (diff)
downloaddjango-rest-framework-e2d3aa65d78511b526ecac24bf4198dfa4f27c16.tar.bz2
Move and rename LabelModelSerializer for further reuse
-rw-r--r--rest_framework/tests/models.py7
-rw-r--r--rest_framework/tests/serializer.py7
2 files changed, 9 insertions, 5 deletions
diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index 3465268b..486ec761 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -1,6 +1,7 @@
from __future__ import unicode_literals
from django.db import models
from django.utils.translation import ugettext_lazy as _
+from rest_framework import serializers
def foobar():
@@ -160,3 +161,9 @@ class NullableOneToOneSource(RESTFrameworkModel):
name = models.CharField(max_length=100)
target = models.OneToOneField(OneToOneTarget, null=True, blank=True,
related_name='nullable_source')
+
+# Serializer used to test BasicModel
+class BasicModelSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = BasicModel
+
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index fc433a8f..343b958a 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -5,6 +5,7 @@ from rest_framework import serializers, fields, relations
from rest_framework.tests.models import (HasPositiveIntegerAsChoice, Album, ActionItem, Anchor, BasicModel,
BlankFieldModel, BlogPost, BlogPostComment, Book, CallableDefaultValueModel, DefaultValueModel,
ManyToManyModel, Person, ReadOnlyManyToManyModel, Photo)
+from rest_framework.tests.models import BasicModelSerializer
import datetime
import pickle
@@ -1148,11 +1149,7 @@ class DeserializeListTestCase(TestCase):
# Test for issue #467
class FieldLabelTest(TestCase):
def setUp(self):
- class LabelModelSerializer(serializers.ModelSerializer):
- class Meta:
- model = BasicModel
-
- self.serializer_class = LabelModelSerializer
+ self.serializer_class = BasicModelSerializer
def test_label_from_model(self):
"""