From 18bbda84b9c663fec6eede112a21cf1a48103303 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 11 Apr 2011 17:13:11 +0100 Subject: depercate auth and content arguments to the request handler methods - yea :) --- djangorestframework/tests/files.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'djangorestframework/tests/files.py') diff --git a/djangorestframework/tests/files.py b/djangorestframework/tests/files.py index e155f181..dd4689a6 100644 --- a/djangorestframework/tests/files.py +++ b/djangorestframework/tests/files.py @@ -19,10 +19,9 @@ class UploadFilesTests(TestCase): allowed_methods = anon_allowed_methods = ('POST',) form = FileForm - def post(self, request, auth, content, *args, **kwargs): - #self.uploaded = content.file - return {'FILE_NAME': content['file'].name, - 'FILE_CONTENT': content['file'].read()} + def post(self, request, *args, **kwargs): + return {'FILE_NAME': self.CONTENT['file'].name, + 'FILE_CONTENT': self.CONTENT['file'].read()} file = StringIO.StringIO('stuff') file.name = 'stuff.txt' -- cgit v1.2.3 From 4692374e0d6f020f8a7a95f3a60094d525c59341 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 25 Apr 2011 01:03:23 +0100 Subject: Generic permissions added, allowed_methods and anon_allowed_methods now defunct, dispatch now mirrors View.dispatch more nicely --- djangorestframework/tests/files.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'djangorestframework/tests/files.py') diff --git a/djangorestframework/tests/files.py b/djangorestframework/tests/files.py index dd4689a6..4dc3aa40 100644 --- a/djangorestframework/tests/files.py +++ b/djangorestframework/tests/files.py @@ -16,7 +16,7 @@ class UploadFilesTests(TestCase): file = forms.FileField class MockResource(Resource): - allowed_methods = anon_allowed_methods = ('POST',) + permissions = () form = FileForm def post(self, request, *args, **kwargs): -- cgit v1.2.3 From d373b3a067796b8e181be9368fa24e89c572c45e Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 4 May 2011 09:21:17 +0100 Subject: Decouple views and resources --- djangorestframework/tests/files.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'djangorestframework/tests/files.py') diff --git a/djangorestframework/tests/files.py b/djangorestframework/tests/files.py index 4dc3aa40..f0321cb3 100644 --- a/djangorestframework/tests/files.py +++ b/djangorestframework/tests/files.py @@ -1,7 +1,7 @@ from django.test import TestCase from django import forms from djangorestframework.compat import RequestFactory -from djangorestframework.resource import Resource +from djangorestframework.views import BaseView import StringIO class UploadFilesTests(TestCase): @@ -15,7 +15,7 @@ class UploadFilesTests(TestCase): class FileForm(forms.Form): file = forms.FileField - class MockResource(Resource): + class MockView(BaseView): permissions = () form = FileForm @@ -26,7 +26,7 @@ class UploadFilesTests(TestCase): file = StringIO.StringIO('stuff') file.name = 'stuff.txt' request = self.factory.post('/', {'file': file}) - view = MockResource.as_view() + view = MockView.as_view() response = view(request) self.assertEquals(response.content, '{"FILE_CONTENT": "stuff", "FILE_NAME": "stuff.txt"}') -- cgit v1.2.3 From 15f9e7c56699d31043782045a9fe47c354f612cb Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 12 May 2011 12:55:13 +0100 Subject: refactoring resource specfic stuff into ResourceMixin - validators now defunct --- djangorestframework/tests/files.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'djangorestframework/tests/files.py') diff --git a/djangorestframework/tests/files.py b/djangorestframework/tests/files.py index f0321cb3..fc82fd83 100644 --- a/djangorestframework/tests/files.py +++ b/djangorestframework/tests/files.py @@ -2,6 +2,7 @@ from django.test import TestCase from django import forms from djangorestframework.compat import RequestFactory from djangorestframework.views import BaseView +from djangorestframework.resource import FormResource import StringIO class UploadFilesTests(TestCase): @@ -15,9 +16,12 @@ class UploadFilesTests(TestCase): class FileForm(forms.Form): file = forms.FileField + class MockResource(FormResource): + form = FileForm + class MockView(BaseView): permissions = () - form = FileForm + resource = MockResource def post(self, request, *args, **kwargs): return {'FILE_NAME': self.CONTENT['file'].name, -- cgit v1.2.3 From b5b231a874c7d8d54b1d3849cb95337f15bac9c6 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 12 May 2011 15:11:14 +0100 Subject: yet more API cleanup --- djangorestframework/tests/files.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'djangorestframework/tests/files.py') diff --git a/djangorestframework/tests/files.py b/djangorestframework/tests/files.py index fc82fd83..afa59b4e 100644 --- a/djangorestframework/tests/files.py +++ b/djangorestframework/tests/files.py @@ -2,7 +2,7 @@ from django.test import TestCase from django import forms from djangorestframework.compat import RequestFactory from djangorestframework.views import BaseView -from djangorestframework.resource import FormResource +from djangorestframework.resources import FormResource import StringIO class UploadFilesTests(TestCase): -- cgit v1.2.3 From 44c8b89c6051483677e72a6fc657b1e0457182d1 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 12 May 2011 16:03:14 +0100 Subject: _perform_form_overloading becomes transparent --- djangorestframework/tests/files.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'djangorestframework/tests/files.py') diff --git a/djangorestframework/tests/files.py b/djangorestframework/tests/files.py index afa59b4e..3892422c 100644 --- a/djangorestframework/tests/files.py +++ b/djangorestframework/tests/files.py @@ -24,8 +24,8 @@ class UploadFilesTests(TestCase): resource = MockResource def post(self, request, *args, **kwargs): - return {'FILE_NAME': self.CONTENT['file'].name, - 'FILE_CONTENT': self.CONTENT['file'].read()} + return {'FILE_NAME': self.CONTENT['file'][0].name, + 'FILE_CONTENT': self.CONTENT['file'][0].read()} file = StringIO.StringIO('stuff') file.name = 'stuff.txt' -- cgit v1.2.3 From 370274f5640d55ef71422f7a2440710a43ff900e Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 24 May 2011 10:27:24 +0100 Subject: Allow views to return HttpResponses. Add initial() hook method --- djangorestframework/tests/files.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'djangorestframework/tests/files.py') diff --git a/djangorestframework/tests/files.py b/djangorestframework/tests/files.py index 3892422c..25aad9b4 100644 --- a/djangorestframework/tests/files.py +++ b/djangorestframework/tests/files.py @@ -1,7 +1,7 @@ from django.test import TestCase from django import forms from djangorestframework.compat import RequestFactory -from djangorestframework.views import BaseView +from djangorestframework.views import View from djangorestframework.resources import FormResource import StringIO @@ -19,7 +19,7 @@ class UploadFilesTests(TestCase): class MockResource(FormResource): form = FileForm - class MockView(BaseView): + class MockView(View): permissions = () resource = MockResource -- cgit v1.2.3