Merge branch 'version-3.1' of git://github.com/jpadilla/django-rest-framework into version-3.1

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/test_fields.py b/tests/test_fields.py
index 48ada780..5a5418e6 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -410,6 +410,14 @@ class TestCharField(FieldValues):
     }
     field = serializers.CharField()
 
+    def test_trim_whitespace_default(self):
+        field = serializers.CharField()
+        assert field.to_representation(' abc ') == 'abc'
+
+    def test_trim_whitespace_disabled(self):
+        field = serializers.CharField(trim_whitespace=False)
+        assert field.to_representation(' abc ') == ' abc '
+
 
 class TestEmailField(FieldValues):
     """