From 5bb6301b7f53e3815ab1a81a5fa38721dc95b113 Mon Sep 17 00:00:00 2001
From: Sébastien Piquemal
Date: Thu, 2 Feb 2012 18:19:44 +0200
Subject: Response as a subclass of HttpResponse - first draft, not quite there
 yet.

---
 djangorestframework/tests/files.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'djangorestframework/tests/files.py')

diff --git a/djangorestframework/tests/files.py b/djangorestframework/tests/files.py
index d3b1cc56..bbdff70b 100644
--- a/djangorestframework/tests/files.py
+++ b/djangorestframework/tests/files.py
@@ -1,8 +1,11 @@
 from django.test import TestCase
 from django import forms
+
 from djangorestframework.compat import RequestFactory
 from djangorestframework.views import View
 from djangorestframework.resources import FormResource
+from djangorestframework.response import Response
+
 import StringIO
 
 class UploadFilesTests(TestCase):
@@ -20,13 +23,13 @@ class UploadFilesTests(TestCase):
             form = FileForm
 
             def post(self, request, *args, **kwargs):
-                return {'FILE_NAME': self.CONTENT['file'].name,
-                        'FILE_CONTENT': self.CONTENT['file'].read()}
+                return Response({'FILE_NAME': self.CONTENT['file'].name,
+                        'FILE_CONTENT': self.CONTENT['file'].read()})
 
         file = StringIO.StringIO('stuff')
         file.name = 'stuff.txt'
         request = self.factory.post('/', {'file': file})
         view = MockView.as_view()
         response = view(request)
-        self.assertEquals(response.content, '{"FILE_CONTENT": "stuff", "FILE_NAME": "stuff.txt"}')
+        self.assertEquals(response.raw_content, {"FILE_CONTENT": "stuff", "FILE_NAME": "stuff.txt"})
 
-- 
cgit v1.2.3


From aed26b218ea39110489e85abc6f412399a1774a1 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 24 Aug 2012 22:11:00 +0100
Subject: Drop out resources & mixins

---
 djangorestframework/tests/files.py | 51 +++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

(limited to 'djangorestframework/tests/files.py')

diff --git a/djangorestframework/tests/files.py b/djangorestframework/tests/files.py
index bbdff70b..90a613b9 100644
--- a/djangorestframework/tests/files.py
+++ b/djangorestframework/tests/files.py
@@ -1,35 +1,34 @@
-from django.test import TestCase
-from django import forms
+# from django.test import TestCase
+# from django import forms
 
-from djangorestframework.compat import RequestFactory
-from djangorestframework.views import View
-from djangorestframework.resources import FormResource
-from djangorestframework.response import Response
+# from djangorestframework.compat import RequestFactory
+# from djangorestframework.views import View
+# from djangorestframework.response import Response
 
-import StringIO
+# import StringIO
 
-class UploadFilesTests(TestCase):
-    """Check uploading of files"""
-    def setUp(self):
-        self.factory = RequestFactory()
 
-    def test_upload_file(self):
+# class UploadFilesTests(TestCase):
+#     """Check uploading of files"""
+#     def setUp(self):
+#         self.factory = RequestFactory()
 
-        class FileForm(forms.Form):
-            file = forms.FileField()
+#     def test_upload_file(self):
 
-        class MockView(View):
-            permissions = ()
-            form = FileForm
+#         class FileForm(forms.Form):
+#             file = forms.FileField()
 
-            def post(self, request, *args, **kwargs):
-                return Response({'FILE_NAME': self.CONTENT['file'].name,
-                        'FILE_CONTENT': self.CONTENT['file'].read()})
+#         class MockView(View):
+#             permissions = ()
+#             form = FileForm
 
-        file = StringIO.StringIO('stuff')
-        file.name = 'stuff.txt'
-        request = self.factory.post('/', {'file': file})
-        view = MockView.as_view()
-        response = view(request)
-        self.assertEquals(response.raw_content, {"FILE_CONTENT": "stuff", "FILE_NAME": "stuff.txt"})
+#             def post(self, request, *args, **kwargs):
+#                 return Response({'FILE_NAME': self.CONTENT['file'].name,
+#                         'FILE_CONTENT': self.CONTENT['file'].read()})
 
+#         file = StringIO.StringIO('stuff')
+#         file.name = 'stuff.txt'
+#         request = self.factory.post('/', {'file': file})
+#         view = MockView.as_view()
+#         response = view(request)
+#         self.assertEquals(response.raw_content, {"FILE_CONTENT": "stuff", "FILE_NAME": "stuff.txt"})
-- 
cgit v1.2.3


From 87dae4d8549c02fa9a57adb3bb876d249dae1f79 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 20 Sep 2012 13:19:43 +0100
Subject: Remove old 'djangorestframework directories

---
 djangorestframework/tests/files.py | 34 ----------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 djangorestframework/tests/files.py

(limited to 'djangorestframework/tests/files.py')

diff --git a/djangorestframework/tests/files.py b/djangorestframework/tests/files.py
deleted file mode 100644
index 90a613b9..00000000
--- a/djangorestframework/tests/files.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# from django.test import TestCase
-# from django import forms
-
-# from djangorestframework.compat import RequestFactory
-# from djangorestframework.views import View
-# from djangorestframework.response import Response
-
-# import StringIO
-
-
-# class UploadFilesTests(TestCase):
-#     """Check uploading of files"""
-#     def setUp(self):
-#         self.factory = RequestFactory()
-
-#     def test_upload_file(self):
-
-#         class FileForm(forms.Form):
-#             file = forms.FileField()
-
-#         class MockView(View):
-#             permissions = ()
-#             form = FileForm
-
-#             def post(self, request, *args, **kwargs):
-#                 return Response({'FILE_NAME': self.CONTENT['file'].name,
-#                         'FILE_CONTENT': self.CONTENT['file'].read()})
-
-#         file = StringIO.StringIO('stuff')
-#         file.name = 'stuff.txt'
-#         request = self.factory.post('/', {'file': file})
-#         view = MockView.as_view()
-#         response = view(request)
-#         self.assertEquals(response.raw_content, {"FILE_CONTENT": "stuff", "FILE_NAME": "stuff.txt"})
-- 
cgit v1.2.3