From 430f00847aece92172ad1ef3a0112897d8931019 Mon Sep 17 00:00:00 2001
From: Will Kahn-Greene
Date: Fri, 16 Aug 2013 09:20:49 -0400
Subject: Add test for BooleanField and required

This tests setting required=True on a BooleanField.

Test for issue #1004.
---
 rest_framework/tests/test_fields.py | 9 +++++++++
 1 file changed, 9 insertions(+)

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

diff --git a/rest_framework/tests/test_fields.py b/rest_framework/tests/test_fields.py
index 6836ec86..ebccba7d 100644
--- a/rest_framework/tests/test_fields.py
+++ b/rest_framework/tests/test_fields.py
@@ -896,3 +896,12 @@ class CustomIntegerField(TestCase):
         self.assertFalse(serializer.is_valid())
 
 
+class BooleanField(TestCase):
+    """
+        Tests for BooleanField
+    """
+    def test_boolean_required(self):
+        class BooleanRequiredSerializer(serializers.Serializer):
+            bool_field = serializers.BooleanField(required=True)
+
+        self.assertFalse(BooleanRequiredSerializer(data={}).is_valid())
-- 
cgit v1.2.3


From 11071499a777ecfee6edfb7e92ecf9a12d35eeb7 Mon Sep 17 00:00:00 2001
From: Mathieu Pillard
Date: Thu, 29 Aug 2013 18:10:47 +0200
Subject: Make ChoiceField.from_native() follow IntegerField behaviour on empty
 values

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

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

diff --git a/rest_framework/tests/test_fields.py b/rest_framework/tests/test_fields.py
index ebccba7d..34fbab9c 100644
--- a/rest_framework/tests/test_fields.py
+++ b/rest_framework/tests/test_fields.py
@@ -688,6 +688,14 @@ class ChoiceFieldTests(TestCase):
         f = serializers.ChoiceField(required=False, choices=self.SAMPLE_CHOICES)
         self.assertEqual(f.choices, models.fields.BLANK_CHOICE_DASH + self.SAMPLE_CHOICES)
 
+    def test_from_native_empty(self):
+        """
+        Make sure from_native() returns None on empty param.
+        """
+        f = serializers.ChoiceField(choices=self.SAMPLE_CHOICES)
+        result = f.from_native('')
+        self.assertEqual(result, None)
+
 
 class EmailFieldTests(TestCase):
     """
-- 
cgit v1.2.3