aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTom Christie2015-01-29 21:25:07 +0000
committerTom Christie2015-01-29 21:25:07 +0000
commit2a43d9db87f92097bbc8720c3fc8f8a1dfba5a94 (patch)
treecbc175154ae21c78ed20d9bdc436707564ee9e5d /tests
parent60a63ffd2926f2e88dfa91fffa87b7aa0c1d73dd (diff)
parente720927b78a31999f03bfa248329d623ce2c045c (diff)
downloaddjango-rest-framework-2a43d9db87f92097bbc8720c3fc8f8a1dfba5a94.tar.bz2
Merge pull request #2486 from maryokhin/master
Cleanup '.model' shortcut from code and docs
Diffstat (limited to 'tests')
-rw-r--r--tests/test_routers.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/test_routers.py b/tests/test_routers.py
index 86113f5d..948c69bb 100644
--- a/tests/test_routers.py
+++ b/tests/test_routers.py
@@ -180,7 +180,7 @@ class TestLookupValueRegex(TestCase):
class TestTrailingSlashIncluded(TestCase):
def setUp(self):
class NoteViewSet(viewsets.ModelViewSet):
- model = RouterTestModel
+ queryset = RouterTestModel.objects.all()
self.router = SimpleRouter()
self.router.register(r'notes', NoteViewSet)
@@ -195,7 +195,7 @@ class TestTrailingSlashIncluded(TestCase):
class TestTrailingSlashRemoved(TestCase):
def setUp(self):
class NoteViewSet(viewsets.ModelViewSet):
- model = RouterTestModel
+ queryset = RouterTestModel.objects.all()
self.router = SimpleRouter(trailing_slash=False)
self.router.register(r'notes', NoteViewSet)
@@ -210,7 +210,8 @@ class TestTrailingSlashRemoved(TestCase):
class TestNameableRoot(TestCase):
def setUp(self):
class NoteViewSet(viewsets.ModelViewSet):
- model = RouterTestModel
+ queryset = RouterTestModel.objects.all()
+
self.router = DefaultRouter()
self.router.root_view_name = 'nameable-root'
self.router.register(r'notes', NoteViewSet)