From 69a01d71256b9923aac1b8d1b91063068ecfebf7 Mon Sep 17 00:00:00 2001
From: Marko Tibold
Date: Wed, 14 Nov 2012 23:04:46 +0100
Subject: Added a test for the FileField.

---
 rest_framework/tests/files.py | 55 +++++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 25 deletions(-)

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

diff --git a/rest_framework/tests/files.py b/rest_framework/tests/files.py
index 61d7f7b1..5dd57b7c 100644
--- a/rest_framework/tests/files.py
+++ b/rest_framework/tests/files.py
@@ -1,34 +1,39 @@
-# from django.test import TestCase
-# from django import forms
+import StringIO
+import datetime
 
-# from django.test.client import RequestFactory
-# from rest_framework.views import View
-# from rest_framework.response import Response
+from django.test import TestCase
 
-# import StringIO
+from rest_framework import serializers
 
 
-# class UploadFilesTests(TestCase):
-#     """Check uploading of files"""
-#     def setUp(self):
-#         self.factory = RequestFactory()
+class UploadedFile(object):
+    def __init__(self, file, created=None):
+        self.file = file
+        self.created = created or datetime.datetime.now()
 
-#     def test_upload_file(self):
 
-#         class FileForm(forms.Form):
-#             file = forms.FileField()
+class UploadedFileSerializer(serializers.Serializer):
+    file = serializers.FileField()
+    created = serializers.DateTimeField()
 
-#         class MockView(View):
-#             permissions = ()
-#             form = FileForm
+    def restore_object(self, attrs, instance=None):
+        if instance:
+            instance.file = attrs['file']
+            instance.created = attrs['created']
+            return instance
+        return UploadedFile(**attrs)
 
-#             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"})
+class FileSerializerTests(TestCase):
+
+    def test_create(self):
+        now = datetime.datetime.now()
+        file = StringIO.StringIO('stuff')
+        file.name = 'stuff.txt'
+        file.size = file.len
+        serializer = UploadedFileSerializer(data={'created': now}, files={'file': file})
+        uploaded_file = UploadedFile(file=file, created=now)
+        self.assertTrue(serializer.is_valid())
+        self.assertEquals(serializer.object.created, uploaded_file.created)
+        self.assertEquals(serializer.object.file, uploaded_file.file)
+        self.assertFalse(serializer.object is uploaded_file)
-- 
cgit v1.2.3


From 1c8fccfdcd6186023a6ca6c8d50759172081d05a Mon Sep 17 00:00:00 2001
From: Yuri Prezument
Date: Wed, 2 Jan 2013 22:07:23 +0200
Subject: Regression test for #542

---
 rest_framework/tests/files.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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

diff --git a/rest_framework/tests/files.py b/rest_framework/tests/files.py
index 5dd57b7c..a98e33ef 100644
--- a/rest_framework/tests/files.py
+++ b/rest_framework/tests/files.py
@@ -25,7 +25,6 @@ class UploadedFileSerializer(serializers.Serializer):
 
 
 class FileSerializerTests(TestCase):
-
     def test_create(self):
         now = datetime.datetime.now()
         file = StringIO.StringIO('stuff')
@@ -37,3 +36,16 @@ class FileSerializerTests(TestCase):
         self.assertEquals(serializer.object.created, uploaded_file.created)
         self.assertEquals(serializer.object.file, uploaded_file.file)
         self.assertFalse(serializer.object is uploaded_file)
+
+    def test_creation_failure(self):
+        """
+        Passing files=None should result in an ValidationError
+
+        Regression test for:
+        https://github.com/tomchristie/django-rest-framework/issues/542
+        """
+        now = datetime.datetime.now()
+
+        serializer = UploadedFileSerializer(data={'created': now}, files=None)
+        self.assertFalse(serializer.is_valid())
+        self.assertIn('file', serializer.errors)
-- 
cgit v1.2.3


From 3f5e938247ab05efbc8e9a2a21ef1a610231a763 Mon Sep 17 00:00:00 2001
From: Yuri Prezument
Date: Thu, 3 Jan 2013 08:28:17 +0200
Subject: Some cleanup

---
 rest_framework/tests/files.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/rest_framework/tests/files.py b/rest_framework/tests/files.py
index a98e33ef..446e23c0 100644
--- a/rest_framework/tests/files.py
+++ b/rest_framework/tests/files.py
@@ -46,6 +46,6 @@ class FileSerializerTests(TestCase):
         """
         now = datetime.datetime.now()
 
-        serializer = UploadedFileSerializer(data={'created': now}, files=None)
+        serializer = UploadedFileSerializer(data={'created': now})
         self.assertFalse(serializer.is_valid())
         self.assertIn('file', serializer.errors)
-- 
cgit v1.2.3