aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/tests/mixins.py
diff options
context:
space:
mode:
authorSébastien Piquemal2012-02-02 08:39:15 +0200
committerSébastien Piquemal2012-02-02 08:39:15 +0200
commit5f59d90645dfddc293bbbbc4ca9b4c3f3125b590 (patch)
treeaa3d091a1f61f5717f7f1a9e96334308bb13c7d9 /djangorestframework/tests/mixins.py
parent152c385f4de37558fe4e522abad5b97f0cf7ddce (diff)
parent894f63259880252ed5317ce485eb13c4429b65c1 (diff)
downloaddjango-rest-framework-5f59d90645dfddc293bbbbc4ca9b4c3f3125b590.tar.bz2
merged with trunk's master
Diffstat (limited to 'djangorestframework/tests/mixins.py')
-rw-r--r--djangorestframework/tests/mixins.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/djangorestframework/tests/mixins.py b/djangorestframework/tests/mixins.py
index 72e0b8b0..a7512efc 100644
--- a/djangorestframework/tests/mixins.py
+++ b/djangorestframework/tests/mixins.py
@@ -30,7 +30,7 @@ class TestModelRead(TestModelsTestCase):
mixin = ReadModelMixin()
mixin.resource = GroupResource
- response = mixin.get(request, group.id)
+ response = mixin.get(request, id=group.id)
self.assertEquals(group.name, response.name)
def test_read_404(self):
@@ -41,8 +41,7 @@ class TestModelRead(TestModelsTestCase):
mixin = ReadModelMixin()
mixin.resource = GroupResource
- with self.assertRaises(ErrorResponse):
- response = mixin.get(request, 12345)
+ self.assertRaises(ErrorResponse, mixin.get, request, id=12345)
class TestModelCreation(TestModelsTestCase):