From 4b691c402707775c3048a90531024f3bc5be6f91 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 20 Sep 2012 13:06:27 +0100
Subject: Change package name: djangorestframework -> rest_framework

---
 rest_framework/tests/serializer.py | 117 +++++++++++++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)
 create mode 100644 rest_framework/tests/serializer.py

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
new file mode 100644
index 00000000..16de2c66
--- /dev/null
+++ b/rest_framework/tests/serializer.py
@@ -0,0 +1,117 @@
+import datetime
+from django.test import TestCase
+from rest_framework import serializers
+
+
+class Comment(object):
+    def __init__(self, email, content, created):
+        self.email = email
+        self.content = content
+        self.created = created or datetime.datetime.now()
+
+    def __eq__(self, other):
+        return all([getattr(self, attr) == getattr(other, attr)
+                    for attr in ('email', 'content', 'created')])
+
+
+class CommentSerializer(serializers.Serializer):
+    email = serializers.EmailField()
+    content = serializers.CharField(max_length=1000)
+    created = serializers.DateTimeField()
+
+    def restore_object(self, data, instance=None):
+        if instance is None:
+            return Comment(**data)
+        for key, val in data.items():
+            setattr(instance, key, val)
+        return instance
+
+
+class BasicTests(TestCase):
+    def setUp(self):
+        self.comment = Comment(
+            'tom@example.com',
+            'Happy new year!',
+            datetime.datetime(2012, 1, 1)
+        )
+        self.data = {
+            'email': 'tom@example.com',
+            'content': 'Happy new year!',
+            'created': datetime.datetime(2012, 1, 1)
+        }
+
+    def test_empty(self):
+        serializer = CommentSerializer()
+        expected = {
+            'email': '',
+            'content': '',
+            'created': None
+        }
+        self.assertEquals(serializer.data, expected)
+
+    def test_serialization(self):
+        serializer = CommentSerializer(instance=self.comment)
+        expected = self.data
+        self.assertEquals(serializer.data, expected)
+
+    def test_deserialization_for_create(self):
+        serializer = CommentSerializer(self.data)
+        expected = self.comment
+        self.assertEquals(serializer.is_valid(), True)
+        self.assertEquals(serializer.object, expected)
+        self.assertFalse(serializer.object is expected)
+
+    def test_deserialization_for_update(self):
+        serializer = CommentSerializer(self.data, instance=self.comment)
+        expected = self.comment
+        self.assertEquals(serializer.is_valid(), True)
+        self.assertEquals(serializer.object, expected)
+        self.assertTrue(serializer.object is expected)
+
+
+class ValidationTests(TestCase):
+    def setUp(self):
+        self.comment = Comment(
+            'tom@example.com',
+            'Happy new year!',
+            datetime.datetime(2012, 1, 1)
+        )
+        self.data = {
+            'email': 'tom@example.com',
+            'content': 'x' * 1001,
+            'created': datetime.datetime(2012, 1, 1)
+        }
+
+    def test_deserialization_for_create(self):
+        serializer = CommentSerializer(self.data)
+        self.assertEquals(serializer.is_valid(), False)
+        self.assertEquals(serializer.errors, {'content': [u'Ensure this value has at most 1000 characters (it has 1001).']})
+
+    def test_deserialization_for_update(self):
+        serializer = CommentSerializer(self.data, instance=self.comment)
+        self.assertEquals(serializer.is_valid(), False)
+        self.assertEquals(serializer.errors, {'content': [u'Ensure this value has at most 1000 characters (it has 1001).']})
+
+
+class MetadataTests(TestCase):
+    # def setUp(self):
+    #     self.comment = Comment(
+    #         'tomchristie',
+    #         'Happy new year!',
+    #         datetime.datetime(2012, 1, 1)
+    #     )
+    #     self.data = {
+    #         'email': 'tomchristie',
+    #         'content': 'Happy new year!',
+    #         'created': datetime.datetime(2012, 1, 1)
+    #     }
+
+    def test_empty(self):
+        serializer = CommentSerializer()
+        expected = {
+            'email': serializers.CharField,
+            'content': serializers.CharField,
+            'created': serializers.DateTimeField
+        }
+        for field_name, field in expected.items():
+            self.assertTrue(isinstance(serializer.data.fields[field_name], field))
-- 
cgit v1.2.3


From 36b58d0c78a065c273a19eeb4f4d6d5a2b92d425 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 3 Oct 2012 10:51:38 +0100
Subject: Many2Many test

---
 rest_framework/tests/serializer.py | 56 ++++++++++++++++++++++++++++++--------
 1 file changed, 44 insertions(+), 12 deletions(-)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 16de2c66..7de79f95 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1,6 +1,7 @@
 import datetime
 from django.test import TestCase
 from rest_framework import serializers
+from rest_framework.tests.models import *
 
 
 class Comment(object):
@@ -94,18 +95,6 @@ class ValidationTests(TestCase):
 
 
 class MetadataTests(TestCase):
-    # def setUp(self):
-    #     self.comment = Comment(
-    #         'tomchristie',
-    #         'Happy new year!',
-    #         datetime.datetime(2012, 1, 1)
-    #     )
-    #     self.data = {
-    #         'email': 'tomchristie',
-    #         'content': 'Happy new year!',
-    #         'created': datetime.datetime(2012, 1, 1)
-    #     }
-
     def test_empty(self):
         serializer = CommentSerializer()
         expected = {
@@ -115,3 +104,46 @@ class MetadataTests(TestCase):
         }
         for field_name, field in expected.items():
             self.assertTrue(isinstance(serializer.data.fields[field_name], field))
+
+
+class ManyToManyTests(TestCase):
+    def setUp(self):
+        class ManyToManySerializer(serializers.ModelSerializer):
+            class Meta:
+                model = ManyToManyModel
+
+        self.serializer_class = ManyToManySerializer
+
+        # An anchor instance to use for the relationship
+        self.anchor = Anchor()
+        self.anchor.save()
+
+        # A model instance with a many to many relationship to the anchor
+        self.instance = ManyToManyModel()
+        self.instance.save()
+        self.instance.rel.add(self.anchor)
+
+        # A serialized representation of the model instance
+        self.data = {'id': 1, 'rel': [self.anchor.id]}
+
+    def test_retrieve(self):
+        serializer = self.serializer_class(instance=self.instance)
+        expected = self.data
+        self.assertEquals(serializer.data, expected)
+
+    def test_create(self):
+        data = {'rel': [self.anchor.id]}
+        serializer = self.serializer_class(data)
+        self.assertEquals(serializer.is_valid(), True)
+        serializer.object.save()
+        obj = serializer.object.object
+        self.assertEquals(obj.pk, 2)
+        self.assertEquals(list(obj.rel.all()), [self.anchor])
+        # self.assertFalse(serializer.object is expected)
+
+    # def test_deserialization_for_update(self):
+    #     serializer = self.serializer_class(self.data, instance=self.instance)
+    #     expected = self.instance
+    #     self.assertEquals(serializer.is_valid(), True)
+    #     self.assertEquals(serializer.object, expected)
+    #     self.assertTrue(serializer.object is expected)
-- 
cgit v1.2.3


From 7c303411a914430252f482ca24501bf02ba7193c Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 3 Oct 2012 11:08:02 +0100
Subject: Add Serializer.save() to clean up differences between
 serializer.object being either a DeserializedObject or a model instance

---
 rest_framework/tests/serializer.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 7de79f95..b7a9ae99 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -135,10 +135,10 @@ class ManyToManyTests(TestCase):
         data = {'rel': [self.anchor.id]}
         serializer = self.serializer_class(data)
         self.assertEquals(serializer.is_valid(), True)
-        serializer.object.save()
-        obj = serializer.object.object
-        self.assertEquals(obj.pk, 2)
-        self.assertEquals(list(obj.rel.all()), [self.anchor])
+        instance = serializer.save()
+        self.assertEquals(len(ManyToManyModel.objects.all()), 2)
+        self.assertEquals(instance.pk, 2)
+        self.assertEquals(list(instance.rel.all()), [self.anchor])
         # self.assertFalse(serializer.object is expected)
 
     # def test_deserialization_for_update(self):
-- 
cgit v1.2.3


From 89ec0b275039868668080be740c46ebef92cff1e Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 3 Oct 2012 11:14:47 +0100
Subject: Add m2m update test

---
 rest_framework/tests/serializer.py | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index b7a9ae99..f7412a32 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -50,19 +50,19 @@ class BasicTests(TestCase):
         }
         self.assertEquals(serializer.data, expected)
 
-    def test_serialization(self):
+    def test_retrieve(self):
         serializer = CommentSerializer(instance=self.comment)
         expected = self.data
         self.assertEquals(serializer.data, expected)
 
-    def test_deserialization_for_create(self):
+    def test_create(self):
         serializer = CommentSerializer(self.data)
         expected = self.comment
         self.assertEquals(serializer.is_valid(), True)
         self.assertEquals(serializer.object, expected)
         self.assertFalse(serializer.object is expected)
 
-    def test_deserialization_for_update(self):
+    def test_update(self):
         serializer = CommentSerializer(self.data, instance=self.comment)
         expected = self.comment
         self.assertEquals(serializer.is_valid(), True)
@@ -83,12 +83,12 @@ class ValidationTests(TestCase):
             'created': datetime.datetime(2012, 1, 1)
         }
 
-    def test_deserialization_for_create(self):
+    def test_create(self):
         serializer = CommentSerializer(self.data)
         self.assertEquals(serializer.is_valid(), False)
         self.assertEquals(serializer.errors, {'content': [u'Ensure this value has at most 1000 characters (it has 1001).']})
 
-    def test_deserialization_for_update(self):
+    def test_update(self):
         serializer = CommentSerializer(self.data, instance=self.comment)
         self.assertEquals(serializer.is_valid(), False)
         self.assertEquals(serializer.errors, {'content': [u'Ensure this value has at most 1000 characters (it has 1001).']})
@@ -127,11 +127,17 @@ class ManyToManyTests(TestCase):
         self.data = {'id': 1, 'rel': [self.anchor.id]}
 
     def test_retrieve(self):
+        """
+        Serialize an instance of a model with a ManyToMany relationship.
+        """
         serializer = self.serializer_class(instance=self.instance)
         expected = self.data
         self.assertEquals(serializer.data, expected)
 
     def test_create(self):
+        """
+        Create an instance of a model with a ManyToMany relationship.
+        """
         data = {'rel': [self.anchor.id]}
         serializer = self.serializer_class(data)
         self.assertEquals(serializer.is_valid(), True)
@@ -139,7 +145,20 @@ class ManyToManyTests(TestCase):
         self.assertEquals(len(ManyToManyModel.objects.all()), 2)
         self.assertEquals(instance.pk, 2)
         self.assertEquals(list(instance.rel.all()), [self.anchor])
-        # self.assertFalse(serializer.object is expected)
+
+    def test_update(self):
+        """
+        Update an instance of a model with a ManyToMany relationship.
+        """
+        new_anchor = Anchor()
+        new_anchor.save()
+        data = {'rel': [self.anchor.id, new_anchor.id]}
+        serializer = self.serializer_class(data, instance=self.instance)
+        self.assertEquals(serializer.is_valid(), True)
+        instance = serializer.save()
+        self.assertEquals(len(ManyToManyModel.objects.all()), 1)
+        self.assertEquals(instance.pk, 1)
+        self.assertEquals(list(instance.rel.all()), [self.anchor, new_anchor])
 
     # def test_deserialization_for_update(self):
     #     serializer = self.serializer_class(self.data, instance=self.instance)
-- 
cgit v1.2.3


From f1f7f5d4e3cd67730c6fb2233a5e4d6afaeae636 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 3 Oct 2012 11:50:08 +0100
Subject: Added failing test for m2m data

---
 rest_framework/tests/serializer.py | 41 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index f7412a32..f90dce16 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -160,6 +160,47 @@ class ManyToManyTests(TestCase):
         self.assertEquals(instance.pk, 1)
         self.assertEquals(list(instance.rel.all()), [self.anchor, new_anchor])
 
+    def test_create_empty_relationship(self):
+        """
+        Create an instance of a model with a ManyToMany relationship,
+        containing no items.
+        """
+        data = {'rel': []}
+        serializer = self.serializer_class(data)
+        self.assertEquals(serializer.is_valid(), True)
+        instance = serializer.save()
+        self.assertEquals(len(ManyToManyModel.objects.all()), 2)
+        self.assertEquals(instance.pk, 2)
+        self.assertEquals(list(instance.rel.all()), [])
+
+    def test_update_empty_relationship(self):
+        """
+        Update an instance of a model with a ManyToMany relationship,
+        containing no items.
+        """
+        new_anchor = Anchor()
+        new_anchor.save()
+        data = {'rel': []}
+        serializer = self.serializer_class(data, instance=self.instance)
+        self.assertEquals(serializer.is_valid(), True)
+        instance = serializer.save()
+        self.assertEquals(len(ManyToManyModel.objects.all()), 1)
+        self.assertEquals(instance.pk, 1)
+        self.assertEquals(list(instance.rel.all()), [])
+
+    def test_create_empty_relationship_flat_data(self):
+        """
+        Create an instance of a model with a ManyToMany relationship,
+        containing no items, using a representation that does not support
+        lists (eg form data).
+        """
+        data = {'rel': ''}
+        serializer = self.serializer_class(data)
+        self.assertEquals(serializer.is_valid(), True)
+        instance = serializer.save()
+        self.assertEquals(len(ManyToManyModel.objects.all()), 2)
+        self.assertEquals(instance.pk, 2)
+        self.assertEquals(list(instance.rel.all()), [])
     # def test_deserialization_for_update(self):
     #     serializer = self.serializer_class(self.data, instance=self.instance)
     #     expected = self.instance
-- 
cgit v1.2.3


From 58c1263267e5947f8243568edb33273effdc2787 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 3 Oct 2012 12:16:30 +0100
Subject: Use either PrimaryKeyRelatedField or ManyPrimaryKeyRelatedField as
 appropriate (fixes test)

---
 rest_framework/tests/serializer.py | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index f90dce16..db342c9e 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -201,6 +201,7 @@ class ManyToManyTests(TestCase):
         self.assertEquals(len(ManyToManyModel.objects.all()), 2)
         self.assertEquals(instance.pk, 2)
         self.assertEquals(list(instance.rel.all()), [])
+
     # def test_deserialization_for_update(self):
     #     serializer = self.serializer_class(self.data, instance=self.instance)
     #     expected = self.instance
-- 
cgit v1.2.3


From d79e18963e64c1714a29ece6ca59a8a4a1c02516 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 4 Oct 2012 09:29:12 +0100
Subject: Tests for default arguments on fields

---
 rest_framework/tests/serializer.py | 61 ++++++++++++++++++++++++++++++++++----
 1 file changed, 55 insertions(+), 6 deletions(-)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index db342c9e..08a7a9d0 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -202,9 +202,58 @@ class ManyToManyTests(TestCase):
         self.assertEquals(instance.pk, 2)
         self.assertEquals(list(instance.rel.all()), [])
 
-    # def test_deserialization_for_update(self):
-    #     serializer = self.serializer_class(self.data, instance=self.instance)
-    #     expected = self.instance
-    #     self.assertEquals(serializer.is_valid(), True)
-    #     self.assertEquals(serializer.object, expected)
-    #     self.assertTrue(serializer.object is expected)
+
+class DefaultValueTests(TestCase):
+    def setUp(self):
+        class DefaultValueSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = DefaultValueModel
+
+        self.serializer_class = DefaultValueSerializer
+        self.objects = DefaultValueModel.objects
+
+    def test_create_using_default(self):
+        data = {}
+        serializer = self.serializer_class(data)
+        self.assertEquals(serializer.is_valid(), True)
+        instance = serializer.save()
+        self.assertEquals(len(self.objects.all()), 1)
+        self.assertEquals(instance.pk, 1)
+        self.assertEquals(instance.text, 'foobar')
+
+    def test_create_overriding_default(self):
+        data = {'text': 'overridden'}
+        serializer = self.serializer_class(data)
+        self.assertEquals(serializer.is_valid(), True)
+        instance = serializer.save()
+        self.assertEquals(len(self.objects.all()), 1)
+        self.assertEquals(instance.pk, 1)
+        self.assertEquals(instance.text, 'overridden')
+
+
+class CallableDefaultValueTests(TestCase):
+    def setUp(self):
+        class CallableDefaultValueSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = CallableDefaultValueModel
+
+        self.serializer_class = CallableDefaultValueSerializer
+        self.objects = CallableDefaultValueModel.objects
+
+    def test_create_using_default(self):
+        data = {}
+        serializer = self.serializer_class(data)
+        self.assertEquals(serializer.is_valid(), True)
+        instance = serializer.save()
+        self.assertEquals(len(self.objects.all()), 1)
+        self.assertEquals(instance.pk, 1)
+        self.assertEquals(instance.text, 'foobar')
+
+    def test_create_overriding_default(self):
+        data = {'text': 'overridden'}
+        serializer = self.serializer_class(data)
+        self.assertEquals(serializer.is_valid(), True)
+        instance = serializer.save()
+        self.assertEquals(len(self.objects.all()), 1)
+        self.assertEquals(instance.pk, 1)
+        self.assertEquals(instance.text, 'overridden')
-- 
cgit v1.2.3


From 65f592866c5cd5103e99ed453543807bcbdaa9da Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 8 Oct 2012 17:53:18 +0100
Subject: Fix issue where required fields were not being properly validated. 
 Also make model fields with a default value be not required

---
 rest_framework/tests/serializer.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 08a7a9d0..4454791b 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1,3 +1,4 @@
+import copy
 import datetime
 from django.test import TestCase
 from rest_framework import serializers
@@ -93,6 +94,15 @@ class ValidationTests(TestCase):
         self.assertEquals(serializer.is_valid(), False)
         self.assertEquals(serializer.errors, {'content': [u'Ensure this value has at most 1000 characters (it has 1001).']})
 
+    def test_update_missing_field(self):
+        data = {
+            'content': 'xxx',
+            'created': datetime.datetime(2012, 1, 1)
+        }
+        serializer = CommentSerializer(data, instance=self.comment)
+        self.assertEquals(serializer.is_valid(), False)
+        self.assertEquals(serializer.errors, {'email': [u'This field is required.']})
+
 
 class MetadataTests(TestCase):
     def test_empty(self):
-- 
cgit v1.2.3


From 97a7f27c8219181e40dddcaf820545e08283de93 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 9 Oct 2012 15:58:48 +0100
Subject: Rename HTMLTemplateRenderer -> HTMLRenderer, DocuemntingHTMLRenderer
 -> BrowseableAPIRenderer

---
 rest_framework/tests/serializer.py | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 4454791b..256987ad 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1,4 +1,3 @@
-import copy
 import datetime
 from django.test import TestCase
 from rest_framework import serializers
-- 
cgit v1.2.3


From 36cc56bc9d49832ca990ba8568903966f46a2938 Mon Sep 17 00:00:00 2001
From: Jens Alm
Date: Mon, 15 Oct 2012 10:06:50 +0200
Subject: Added tests for TextField

---
 rest_framework/tests/serializer.py | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 256987ad..7208d6a5 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -28,6 +28,26 @@ class CommentSerializer(serializers.Serializer):
         return instance
 
 
+class LongText(object):
+    def __init__(self, content):
+        self.content = content
+
+    def __eq__(self, other):
+        return all([getattr(self, attr) == getattr(other, attr)
+                    for attr in ('content',)])
+
+
+class LongTextSerializer(serializers.Serializer):
+    content = serializers.TextField()
+
+    def restore_object(self, data, instance=None):
+        if instance is None:
+            return LongText(**data)
+        for key, val in data.items():
+            setattr(instance, key, val)
+        return instance
+
+
 class BasicTests(TestCase):
     def setUp(self):
         self.comment = Comment(
@@ -82,6 +102,7 @@ class ValidationTests(TestCase):
             'content': 'x' * 1001,
             'created': datetime.datetime(2012, 1, 1)
         }
+        self.long_text = LongText('test test test test')
 
     def test_create(self):
         serializer = CommentSerializer(self.data)
@@ -102,6 +123,14 @@ class ValidationTests(TestCase):
         self.assertEquals(serializer.is_valid(), False)
         self.assertEquals(serializer.errors, {'email': [u'This field is required.']})
 
+    def test_update_long_text(self):
+        data = {
+            'content' : 'Lorem ipsum dolor sit amet.'
+        }
+        serializer = LongTextSerializer(data, self.long_text)
+        self.assertEquals(serializer.is_valid(), True)
+        self.assertEquals(data['content'], self.long_text.content)
+
 
 class MetadataTests(TestCase):
     def test_empty(self):
-- 
cgit v1.2.3


From 9f3ff0105ad3486e6cbb9c284d0c3ecda7b47e96 Mon Sep 17 00:00:00 2001
From: Jens Alm
Date: Mon, 15 Oct 2012 14:09:29 +0200
Subject: Removed serializer.TextField and related tests

---
 rest_framework/tests/serializer.py | 29 -----------------------------
 1 file changed, 29 deletions(-)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 7208d6a5..256987ad 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -28,26 +28,6 @@ class CommentSerializer(serializers.Serializer):
         return instance
 
 
-class LongText(object):
-    def __init__(self, content):
-        self.content = content
-
-    def __eq__(self, other):
-        return all([getattr(self, attr) == getattr(other, attr)
-                    for attr in ('content',)])
-
-
-class LongTextSerializer(serializers.Serializer):
-    content = serializers.TextField()
-
-    def restore_object(self, data, instance=None):
-        if instance is None:
-            return LongText(**data)
-        for key, val in data.items():
-            setattr(instance, key, val)
-        return instance
-
-
 class BasicTests(TestCase):
     def setUp(self):
         self.comment = Comment(
@@ -102,7 +82,6 @@ class ValidationTests(TestCase):
             'content': 'x' * 1001,
             'created': datetime.datetime(2012, 1, 1)
         }
-        self.long_text = LongText('test test test test')
 
     def test_create(self):
         serializer = CommentSerializer(self.data)
@@ -123,14 +102,6 @@ class ValidationTests(TestCase):
         self.assertEquals(serializer.is_valid(), False)
         self.assertEquals(serializer.errors, {'email': [u'This field is required.']})
 
-    def test_update_long_text(self):
-        data = {
-            'content' : 'Lorem ipsum dolor sit amet.'
-        }
-        serializer = LongTextSerializer(data, self.long_text)
-        self.assertEquals(serializer.is_valid(), True)
-        self.assertEquals(data['content'], self.long_text.content)
-
 
 class MetadataTests(TestCase):
     def test_empty(self):
-- 
cgit v1.2.3


From 38673c35d4aa5487e175ac7c917c66c45ddb6ba4 Mon Sep 17 00:00:00 2001
From: Rob Dobson
Date: Wed, 17 Oct 2012 19:12:34 +0100
Subject: Make default field check safe for boolean values whereby 'False' may
 be an acceptable default value

---
 rest_framework/tests/serializer.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 256987ad..610ed85f 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -28,6 +28,10 @@ class CommentSerializer(serializers.Serializer):
         return instance
 
 
+class ActionItemSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = ActionItem
+
 class BasicTests(TestCase):
     def setUp(self):
         self.comment = Comment(
@@ -81,7 +85,9 @@ class ValidationTests(TestCase):
             'email': 'tom@example.com',
             'content': 'x' * 1001,
             'created': datetime.datetime(2012, 1, 1)
-        }
+        }         
+        self.actionitem = ActionItem('Some to do item',
+        )
 
     def test_create(self):
         serializer = CommentSerializer(self.data)
@@ -102,6 +108,17 @@ class ValidationTests(TestCase):
         self.assertEquals(serializer.is_valid(), False)
         self.assertEquals(serializer.errors, {'email': [u'This field is required.']})
 
+    def test_missing_bool_with_default(self):
+        """Make sure that a boolean value with a 'False' value is not
+        mistaken for not having a default."""
+        data = {
+            'title':'Some action item',
+            #No 'done' value.
+        }
+        serializer = ActionItemSerializer(data, instance=self.actionitem)
+        self.assertEquals(serializer.is_valid(), True)
+        self.assertEquals(serializer.errors, {})
+
 
 class MetadataTests(TestCase):
     def test_empty(self):
-- 
cgit v1.2.3


From d70e387f106c269d5d8c447c77ba26bdb1aafc8f Mon Sep 17 00:00:00 2001
From: Ian Strachan
Date: Thu, 18 Oct 2012 23:45:16 +0100
Subject: Added tests for dotted notation in serializer field source

---
 rest_framework/tests/serializer.py | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 610ed85f..bd1f07da 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -4,6 +4,11 @@ from rest_framework import serializers
 from rest_framework.tests.models import *
 
 
+class SubComment(object):
+    def __init__(self, sub_comment):
+        self.sub_comment = sub_comment
+            
+
 class Comment(object):
     def __init__(self, email, content, created):
         self.email = email
@@ -13,13 +18,18 @@ class Comment(object):
     def __eq__(self, other):
         return all([getattr(self, attr) == getattr(other, attr)
                     for attr in ('email', 'content', 'created')])
+                    
+    def get_sub_comment(self):
+        sub_comment = SubComment('And Merry Christmas!')
+        return sub_comment
 
 
 class CommentSerializer(serializers.Serializer):
     email = serializers.EmailField()
     content = serializers.CharField(max_length=1000)
     created = serializers.DateTimeField()
-
+    sub_comment = serializers.Field(source='get_sub_comment.sub_comment')
+    
     def restore_object(self, data, instance=None):
         if instance is None:
             return Comment(**data)
@@ -42,7 +52,14 @@ class BasicTests(TestCase):
         self.data = {
             'email': 'tom@example.com',
             'content': 'Happy new year!',
-            'created': datetime.datetime(2012, 1, 1)
+            'created': datetime.datetime(2012, 1, 1),
+            'sub_comment': 'This wont change'
+        }
+        self.expected = {
+            'email': 'tom@example.com',
+            'content': 'Happy new year!',
+            'created': datetime.datetime(2012, 1, 1),
+            'sub_comment': 'And Merry Christmas!'
         }
 
     def test_empty(self):
@@ -50,14 +67,14 @@ class BasicTests(TestCase):
         expected = {
             'email': '',
             'content': '',
-            'created': None
+            'created': None,
+            'sub_comment': ''
         }
         self.assertEquals(serializer.data, expected)
 
     def test_retrieve(self):
-        serializer = CommentSerializer(instance=self.comment)
-        expected = self.data
-        self.assertEquals(serializer.data, expected)
+        serializer = CommentSerializer(instance=self.comment)        
+        self.assertEquals(serializer.data, self.expected)
 
     def test_create(self):
         serializer = CommentSerializer(self.data)
@@ -65,6 +82,7 @@ class BasicTests(TestCase):
         self.assertEquals(serializer.is_valid(), True)
         self.assertEquals(serializer.object, expected)
         self.assertFalse(serializer.object is expected)
+        self.assertEquals(serializer.data['sub_comment'], 'And Merry Christmas!')
 
     def test_update(self):
         serializer = CommentSerializer(self.data, instance=self.comment)
@@ -72,6 +90,7 @@ class BasicTests(TestCase):
         self.assertEquals(serializer.is_valid(), True)
         self.assertEquals(serializer.object, expected)
         self.assertTrue(serializer.object is expected)
+        self.assertEquals(serializer.data['sub_comment'], 'And Merry Christmas!')
 
 
 class ValidationTests(TestCase):
-- 
cgit v1.2.3


From 45d4622f090f8d81a04b4d3e888017419676bbc0 Mon Sep 17 00:00:00 2001
From: Jamie Matthews
Date: Mon, 22 Oct 2012 15:12:25 +0100
Subject: Fix serialization of reverse relationships

---
 rest_framework/tests/serializer.py | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index bd1f07da..2dfc04e1 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -302,3 +302,32 @@ class CallableDefaultValueTests(TestCase):
         self.assertEquals(len(self.objects.all()), 1)
         self.assertEquals(instance.pk, 1)
         self.assertEquals(instance.text, 'overridden')
+
+
+class ManyRelatedTests(TestCase):
+    def setUp(self):
+
+        class BlogPostCommentSerializer(serializers.Serializer):
+            text = serializers.CharField()
+
+        class BlogPostSerializer(serializers.Serializer):
+            title = serializers.CharField()
+            comments = BlogPostCommentSerializer(source='blogpostcomment_set')
+
+        self.serializer_class = BlogPostSerializer
+
+    def test_reverse_relations(self):
+        post = BlogPost.objects.create(title="Test blog post")
+        post.blogpostcomment_set.create(text="I hate this blog post")
+        post.blogpostcomment_set.create(text="I love this blog post")
+
+        serializer = self.serializer_class(instance=post)
+        expected = {
+            'title': 'Test blog post',
+            'comments': [
+                {'text': 'I hate this blog post'},
+                {'text': 'I love this blog post'}
+            ]
+        }
+
+        self.assertEqual(serializer.data, expected)
-- 
cgit v1.2.3


From c7a0d52fd7e22fbc4a01ff900bd3b2c1215e984d Mon Sep 17 00:00:00 2001
From: Ian Strachan
Date: Mon, 22 Oct 2012 22:24:26 +0100
Subject: #314 Fix for manytomany field being required in the payload even
 though the field is specified as readonly in the serializer

---
 rest_framework/tests/serializer.py | 54 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 2dfc04e1..c614b66a 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -246,6 +246,60 @@ class ManyToManyTests(TestCase):
         self.assertEquals(len(ManyToManyModel.objects.all()), 2)
         self.assertEquals(instance.pk, 2)
         self.assertEquals(list(instance.rel.all()), [])
+        
+class ReadOnlyManyToManyTests(TestCase):
+    def setUp(self):
+        class ReadOnlyManyToManySerializer(serializers.ModelSerializer):
+            rel =  serializers.ManyRelatedField(readonly=True)
+            class Meta:
+                model = ReadOnlyManyToManyModel
+
+        self.serializer_class = ReadOnlyManyToManySerializer
+
+        # An anchor instance to use for the relationship
+        self.anchor = Anchor()
+        self.anchor.save()
+
+        # A model instance with a many to many relationship to the anchor
+        self.instance = ReadOnlyManyToManyModel()
+        self.instance.save()
+        self.instance.rel.add(self.anchor)
+
+        # A serialized representation of the model instance
+        self.data = {'rel': [self.anchor.id], 'id': 1, 'text': 'anchor'}
+
+
+    def test_update(self):
+        """
+        Attempt to update an instance of a model with a ManyToMany
+        relationship.  Not updated due to readonly=True
+        """
+        new_anchor = Anchor()
+        new_anchor.save()
+        data = {'rel': [self.anchor.id, new_anchor.id]}
+        serializer = self.serializer_class(data, instance=self.instance)
+        self.assertEquals(serializer.is_valid(), True)
+        instance = serializer.save()
+        self.assertEquals(len(ReadOnlyManyToManyModel.objects.all()), 1)
+        self.assertEquals(instance.pk, 1)
+        # rel is still as original (1 entry)
+        self.assertEquals(list(instance.rel.all()), [self.anchor])
+
+    def test_update_without_relationship(self):
+        """
+        Attempt to update an instance of a model where many to ManyToMany
+        relationship is not supplied.  Not updated due to readonly=True
+        """
+        new_anchor = Anchor()
+        new_anchor.save()
+        data = {}
+        serializer = self.serializer_class(data, instance=self.instance)
+        self.assertEquals(serializer.is_valid(), True)
+        instance = serializer.save()
+        self.assertEquals(len(ReadOnlyManyToManyModel.objects.all()), 1)
+        self.assertEquals(instance.pk, 1)
+        # rel is still as original (1 entry)
+        self.assertEquals(list(instance.rel.all()), [self.anchor])
 
 
 class DefaultValueTests(TestCase):
-- 
cgit v1.2.3


From 51fae73f3d565e2702c72ff9841cc072d6490804 Mon Sep 17 00:00:00 2001
From: Jamie Matthews
Date: Wed, 24 Oct 2012 09:28:10 +0100
Subject: Implement per-field validation on Serializers

---
 rest_framework/tests/serializer.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index c614b66a..35908449 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -138,6 +138,31 @@ class ValidationTests(TestCase):
         self.assertEquals(serializer.is_valid(), True)
         self.assertEquals(serializer.errors, {})
 
+    def test_field_validation(self):
+
+        class CommentSerializerWithFieldValidator(CommentSerializer):
+
+            def clean_content(self, attrs, source):
+                value = attrs[source]
+                if "test" not in value:
+                    raise serializers.ValidationError("Test not in value")
+                return attrs
+
+        data = {
+            'email': 'tom@example.com',
+            'content': 'A test comment',
+            'created': datetime.datetime(2012, 1, 1)
+        }
+
+        serializer = CommentSerializerWithFieldValidator(data)
+        self.assertTrue(serializer.is_valid())
+
+        data['content'] = 'This should not validate'
+
+        serializer = CommentSerializerWithFieldValidator(data)
+        self.assertFalse(serializer.is_valid())
+        self.assertEquals(serializer.errors, {'content': [u'Test not in value']})
+
 
 class MetadataTests(TestCase):
     def test_empty(self):
-- 
cgit v1.2.3


From 388a807f64f60d84556288e2ade4f0fe57a8e66b Mon Sep 17 00:00:00 2001
From: Jamie Matthews
Date: Wed, 24 Oct 2012 11:27:01 +0100
Subject: Switch from clean_<fieldname> to validate_<fieldname>, clarify
 documentation

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

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 35908449..a32de80d 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -142,7 +142,7 @@ class ValidationTests(TestCase):
 
         class CommentSerializerWithFieldValidator(CommentSerializer):
 
-            def clean_content(self, attrs, source):
+            def validate_content(self, attrs, source):
                 value = attrs[source]
                 if "test" not in value:
                     raise serializers.ValidationError("Test not in value")
-- 
cgit v1.2.3


From ac2d39892d6b3fbbe5cd53b9ef83367249ba4880 Mon Sep 17 00:00:00 2001
From: Jamie Matthews
Date: Wed, 24 Oct 2012 11:39:17 +0100
Subject: Add cross-field validate method

---
 rest_framework/tests/serializer.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index a32de80d..936f15aa 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -163,6 +163,30 @@ class ValidationTests(TestCase):
         self.assertFalse(serializer.is_valid())
         self.assertEquals(serializer.errors, {'content': [u'Test not in value']})
 
+    def test_cross_field_validation(self):
+
+        class CommentSerializerWithCrossFieldValidator(CommentSerializer):
+
+            def validate(self, attrs):
+                if attrs["email"] not in attrs["content"]:
+                    raise serializers.ValidationError("Email address not in content")
+                return attrs
+
+        data = {
+            'email': 'tom@example.com',
+            'content': 'A comment from tom@example.com',
+            'created': datetime.datetime(2012, 1, 1)
+        }
+
+        serializer = CommentSerializerWithCrossFieldValidator(data)
+        self.assertTrue(serializer.is_valid())
+
+        data['content'] = 'A comment from foo@bar.com'
+
+        serializer = CommentSerializerWithCrossFieldValidator(data)
+        self.assertFalse(serializer.is_valid())
+        self.assertEquals(serializer.errors, {'non_field_errors': [u'Email address not in content']})
+
 
 class MetadataTests(TestCase):
     def test_empty(self):
-- 
cgit v1.2.3


From 67f1265e493adc35239d90aeb3bfeb8492fbd741 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 26 Oct 2012 13:20:30 +0100
Subject: Fix failing 'default' on ModelSerializer

---
 rest_framework/tests/serializer.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 936f15aa..67c97f0f 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -7,7 +7,7 @@ from rest_framework.tests.models import *
 class SubComment(object):
     def __init__(self, sub_comment):
         self.sub_comment = sub_comment
-            
+
 
 class Comment(object):
     def __init__(self, email, content, created):
@@ -18,7 +18,7 @@ class Comment(object):
     def __eq__(self, other):
         return all([getattr(self, attr) == getattr(other, attr)
                     for attr in ('email', 'content', 'created')])
-                    
+
     def get_sub_comment(self):
         sub_comment = SubComment('And Merry Christmas!')
         return sub_comment
@@ -29,7 +29,7 @@ class CommentSerializer(serializers.Serializer):
     content = serializers.CharField(max_length=1000)
     created = serializers.DateTimeField()
     sub_comment = serializers.Field(source='get_sub_comment.sub_comment')
-    
+
     def restore_object(self, data, instance=None):
         if instance is None:
             return Comment(**data)
@@ -42,6 +42,7 @@ class ActionItemSerializer(serializers.ModelSerializer):
     class Meta:
         model = ActionItem
 
+
 class BasicTests(TestCase):
     def setUp(self):
         self.comment = Comment(
@@ -73,7 +74,7 @@ class BasicTests(TestCase):
         self.assertEquals(serializer.data, expected)
 
     def test_retrieve(self):
-        serializer = CommentSerializer(instance=self.comment)        
+        serializer = CommentSerializer(instance=self.comment)
         self.assertEquals(serializer.data, self.expected)
 
     def test_create(self):
@@ -104,7 +105,7 @@ class ValidationTests(TestCase):
             'email': 'tom@example.com',
             'content': 'x' * 1001,
             'created': datetime.datetime(2012, 1, 1)
-        }         
+        }
         self.actionitem = ActionItem('Some to do item',
         )
 
@@ -131,7 +132,7 @@ class ValidationTests(TestCase):
         """Make sure that a boolean value with a 'False' value is not
         mistaken for not having a default."""
         data = {
-            'title':'Some action item',
+            'title': 'Some action item',
             #No 'done' value.
         }
         serializer = ActionItemSerializer(data, instance=self.actionitem)
@@ -295,11 +296,13 @@ class ManyToManyTests(TestCase):
         self.assertEquals(len(ManyToManyModel.objects.all()), 2)
         self.assertEquals(instance.pk, 2)
         self.assertEquals(list(instance.rel.all()), [])
-        
+
+
 class ReadOnlyManyToManyTests(TestCase):
     def setUp(self):
         class ReadOnlyManyToManySerializer(serializers.ModelSerializer):
-            rel =  serializers.ManyRelatedField(readonly=True)
+            rel = serializers.ManyRelatedField(readonly=True)
+
             class Meta:
                 model = ReadOnlyManyToManyModel
 
@@ -317,7 +320,6 @@ class ReadOnlyManyToManyTests(TestCase):
         # A serialized representation of the model instance
         self.data = {'rel': [self.anchor.id], 'id': 1, 'text': 'anchor'}
 
-
     def test_update(self):
         """
         Attempt to update an instance of a model with a ManyToMany
-- 
cgit v1.2.3


From 6e4ab09aae8295e4ef722d59894bc2934435ae46 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Sun, 28 Oct 2012 20:21:45 +0000
Subject: readonly -> read_only

---
 rest_framework/tests/serializer.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 67c97f0f..5df3bd7e 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -301,7 +301,7 @@ class ManyToManyTests(TestCase):
 class ReadOnlyManyToManyTests(TestCase):
     def setUp(self):
         class ReadOnlyManyToManySerializer(serializers.ModelSerializer):
-            rel = serializers.ManyRelatedField(readonly=True)
+            rel = serializers.ManyRelatedField(read_only=True)
 
             class Meta:
                 model = ReadOnlyManyToManyModel
@@ -323,7 +323,7 @@ class ReadOnlyManyToManyTests(TestCase):
     def test_update(self):
         """
         Attempt to update an instance of a model with a ManyToMany
-        relationship.  Not updated due to readonly=True
+        relationship.  Not updated due to read_only=True
         """
         new_anchor = Anchor()
         new_anchor.save()
@@ -339,7 +339,7 @@ class ReadOnlyManyToManyTests(TestCase):
     def test_update_without_relationship(self):
         """
         Attempt to update an instance of a model where many to ManyToMany
-        relationship is not supplied.  Not updated due to readonly=True
+        relationship is not supplied.  Not updated due to read_only=True
         """
         new_anchor = Anchor()
         new_anchor.save()
-- 
cgit v1.2.3


From 6ccbdd10ad91bbc2116c6adf520096e9da95b8e0 Mon Sep 17 00:00:00 2001
From: Marko Tibold
Date: Tue, 30 Oct 2012 00:03:24 +0100
Subject: Adding failing tests that show null=True model fields are won't
 validate if their value is omitted.

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

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 5df3bd7e..eb21dc46 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -43,6 +43,11 @@ class ActionItemSerializer(serializers.ModelSerializer):
         model = ActionItem
 
 
+class PersonSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Person
+
+
 class BasicTests(TestCase):
     def setUp(self):
         self.comment = Comment(
@@ -188,6 +193,14 @@ class ValidationTests(TestCase):
         self.assertFalse(serializer.is_valid())
         self.assertEquals(serializer.errors, {'non_field_errors': [u'Email address not in content']})
 
+    def test_null_is_true_fields(self):
+        """
+        Omitting a value for null-field should validate.
+        """
+        serializer = PersonSerializer({'name': 'marko'})
+        self.assertEquals(serializer.is_valid(), True)
+        self.assertEquals(serializer.errors, {})
+
 
 class MetadataTests(TestCase):
     def test_empty(self):
-- 
cgit v1.2.3


From 0047a4602045ed0ef9efae9aa88143aa6a70d93d Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 30 Oct 2012 11:03:03 +0000
Subject: Merge fixes for 'blank=True' fields.  Fixes #324, Fixes #325

Thanks to @Roarster.
---
 rest_framework/tests/serializer.py | 49 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index eb21dc46..d4b43862 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -449,3 +449,52 @@ class ManyRelatedTests(TestCase):
         }
 
         self.assertEqual(serializer.data, expected)
+
+
+# Test for issue #324
+class BlankFieldTests(TestCase):
+    def setUp(self):
+
+        class BlankFieldModelSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = BlankFieldModel
+
+        class BlankFieldSerializer(serializers.Serializer):
+            title = serializers.CharField(blank=True)
+
+        class NotBlankFieldModelSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = BasicModel
+
+        class NotBlankFieldSerializer(serializers.Serializer):
+            title = serializers.CharField()
+
+        self.model_serializer_class = BlankFieldModelSerializer
+        self.serializer_class = BlankFieldSerializer
+        self.not_blank_model_serializer_class = NotBlankFieldModelSerializer
+        self.not_blank_serializer_class = NotBlankFieldSerializer
+        self.data = {'title': ''}
+
+    def test_create_blank_field(self):
+        serializer = self.serializer_class(self.data)
+        self.assertEquals(serializer.is_valid(), True)
+
+    def test_create_model_blank_field(self):
+        serializer = self.model_serializer_class(self.data)
+        self.assertEquals(serializer.is_valid(), True)
+
+    def test_create_not_blank_field(self):
+        """
+        Test to ensure blank data in a field not marked as blank=True
+        is considered invalid in a non-model serializer
+        """
+        serializer = self.not_blank_serializer_class(self.data)
+        self.assertEquals(serializer.is_valid(), False)
+
+    def test_create_model_not_blank_field(self):
+        """
+        Test to ensure blank data in a field not marked as blank=True
+        is considered invalid in a model serializer
+        """
+        serializer = self.not_blank_model_serializer_class(self.data)
+        self.assertEquals(serializer.is_valid(), False)
-- 
cgit v1.2.3