aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/tests
diff options
context:
space:
mode:
Diffstat (limited to 'djangorestframework/tests')
-rw-r--r--djangorestframework/tests/mixins.py4
-rw-r--r--djangorestframework/tests/models.py2
-rw-r--r--djangorestframework/tests/modelviews.py3
-rw-r--r--djangorestframework/tests/serializer.py4
4 files changed, 8 insertions, 5 deletions
diff --git a/djangorestframework/tests/mixins.py b/djangorestframework/tests/mixins.py
index 65cf4a45..3b814aa7 100644
--- a/djangorestframework/tests/mixins.py
+++ b/djangorestframework/tests/mixins.py
@@ -8,13 +8,15 @@ from djangorestframework.mixins import CreateModelMixin, PaginatorMixin
from djangorestframework.resources import ModelResource
from djangorestframework.response import Response
from djangorestframework.tests.models import CustomUser
+from djangorestframework.tests.testcases import TestModelsTestCase
from djangorestframework.views import View
-class TestModelCreation(TestCase):
+class TestModelCreation(TestModelsTestCase):
"""Tests on CreateModelMixin"""
def setUp(self):
+ super(TestModelsTestCase, self).setUp()
self.req = RequestFactory()
def test_creation(self):
diff --git a/djangorestframework/tests/models.py b/djangorestframework/tests/models.py
index 61da1d45..39ac59e7 100644
--- a/djangorestframework/tests/models.py
+++ b/djangorestframework/tests/models.py
@@ -25,4 +25,4 @@ class UserGroupMap(models.Model):
def get_absolute_url(self):
return ('user_group_map', (), {
'pk': self.id
- }) \ No newline at end of file
+ })
diff --git a/djangorestframework/tests/modelviews.py b/djangorestframework/tests/modelviews.py
index 2fd1878a..3fbc8ab6 100644
--- a/djangorestframework/tests/modelviews.py
+++ b/djangorestframework/tests/modelviews.py
@@ -5,6 +5,7 @@ from django.contrib.auth.models import Group, User
from djangorestframework.resources import ModelResource
from djangorestframework.views import ListOrCreateModelView, InstanceModelView
from djangorestframework.tests.models import CustomUser
+from djangorestframework.tests.testcases import TestModelsTestCase
class GroupResource(ModelResource):
model = Group
@@ -31,7 +32,7 @@ urlpatterns = patterns('',
)
-class ModelViewTests(TestCase):
+class ModelViewTests(TestModelsTestCase):
"""Test the model views djangorestframework provides"""
urls = 'djangorestframework.tests.modelviews'
diff --git a/djangorestframework/tests/serializer.py b/djangorestframework/tests/serializer.py
index fff72c02..5f42e7e2 100644
--- a/djangorestframework/tests/serializer.py
+++ b/djangorestframework/tests/serializer.py
@@ -56,8 +56,8 @@ class TestFieldNesting(TestCase):
self.serialize = self.serializer.serialize
class M1(models.Model):
- field1 = models.CharField()
- field2 = models.CharField()
+ field1 = models.CharField(max_length=256)
+ field2 = models.CharField(max_length=256)
class M2(models.Model):
field = models.OneToOneField(M1)