aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/tests/fields.py
diff options
context:
space:
mode:
authorTom Christie2013-03-07 01:01:07 -0800
committerTom Christie2013-03-07 01:01:07 -0800
commitf5a8f172a32f38fcefa1086fd1e031f5a686f8a0 (patch)
treecec36550c953ed8ec517ff22fee9162f1b9e63cf /rest_framework/tests/fields.py
parent751064a6fda8adeab409d63d06dc4a39be1c159f (diff)
parent2f8d8b499ec50bd3832d1a25fd12b671341d02e9 (diff)
downloaddjango-rest-framework-f5a8f172a32f38fcefa1086fd1e031f5a686f8a0.tar.bz2
Merge pull request #708 from kevinastone/master
Fixed DateField with Empty Values (Fixes #707)
Diffstat (limited to 'rest_framework/tests/fields.py')
-rw-r--r--rest_framework/tests/fields.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/rest_framework/tests/fields.py b/rest_framework/tests/fields.py
index 28f18ed8..fd6de779 100644
--- a/rest_framework/tests/fields.py
+++ b/rest_framework/tests/fields.py
@@ -171,6 +171,13 @@ class DateFieldTest(TestCase):
self.assertEqual('1984 - 07.31', result_1)
+ def test_to_native_none(self):
+ """
+ Make sure from_native() returns None on None param.
+ """
+ f = serializers.DateField(required=False)
+ self.assertEqual(None, f.to_native(None))
+
class DateTimeFieldTest(TestCase):
"""
@@ -303,6 +310,13 @@ class DateTimeFieldTest(TestCase):
self.assertEqual('1984 - 04:31', result_3)
self.assertEqual('1984 - 04:31', result_4)
+ def test_to_native_none(self):
+ """
+ Make sure from_native() returns None on None param.
+ """
+ f = serializers.DateTimeField(required=False)
+ self.assertEqual(None, f.to_native(None))
+
class TimeFieldTest(TestCase):
"""