From 174b4d943a530aa86105c588e106819a28f0d3fb Mon Sep 17 00:00:00 2001
From: Greg Price <gprice@edx.org>
Date: Thu, 18 Jun 2015 01:51:35 -0400
Subject: [PATCH] Handle whitespace-only content in discussion API

The comments service rejects whitespace-only content for certain
strings, so the discussion API should also reject such content.
---
 .../discussion_api/tests/test_serializers.py  | 20 +++++++++++++++----
 openedx/core/lib/api/fields.py                |  2 +-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/lms/djangoapps/discussion_api/tests/test_serializers.py b/lms/djangoapps/discussion_api/tests/test_serializers.py
index 813119d8f6..e953fcf307 100644
--- a/lms/djangoapps/discussion_api/tests/test_serializers.py
+++ b/lms/djangoapps/discussion_api/tests/test_serializers.py
@@ -458,6 +458,16 @@ class ThreadSerializerDeserializationTest(CommentsServiceMockMixin, UrlResetMixi
                 {field: ["This field is required."]}
             )
 
+    @ddt.data("", " ")
+    def test_create_empty_string(self, value):
+        data = self.minimal_data.copy()
+        data.update({field: value for field in ["topic_id", "title", "raw_body"]})
+        serializer = ThreadSerializer(data=data, context=get_context(self.course, self.request))
+        self.assertEqual(
+            serializer.errors,
+            {field: ["This field is required."] for field in ["topic_id", "title", "raw_body"]}
+        )
+
     def test_create_type(self):
         self.register_post_thread_response({"id": "test_id"})
         data = self.minimal_data.copy()
@@ -514,10 +524,11 @@ class ThreadSerializerDeserializationTest(CommentsServiceMockMixin, UrlResetMixi
         for key in data:
             self.assertEqual(saved[key], data[key])
 
-    def test_update_empty_string(self):
+    @ddt.data("", " ")
+    def test_update_empty_string(self, value):
         serializer = ThreadSerializer(
             self.existing_thread,
-            data={field: "" for field in ["topic_id", "title", "raw_body"]},
+            data={field: value for field in ["topic_id", "title", "raw_body"]},
             partial=True,
             context=get_context(self.course, self.request)
         )
@@ -720,10 +731,11 @@ class CommentSerializerDeserializationTest(CommentsServiceMockMixin, ModuleStore
         self.assertEqual(saved["endorsed_by"], self.user.username)
         self.assertEqual(saved["endorsed_at"], "2015-06-05T00:00:00Z")
 
-    def test_update_empty_raw_body(self):
+    @ddt.data("", " ")
+    def test_update_empty_raw_body(self, value):
         serializer = CommentSerializer(
             self.existing_comment,
-            data={"raw_body": ""},
+            data={"raw_body": value},
             partial=True,
             context=get_context(self.course, self.request)
         )
diff --git a/openedx/core/lib/api/fields.py b/openedx/core/lib/api/fields.py
index eaec6243ca..aae17b3eb6 100644
--- a/openedx/core/lib/api/fields.py
+++ b/openedx/core/lib/api/fields.py
@@ -33,5 +33,5 @@ class NonEmptyCharField(CharField):
     """
     def validate(self, value):
         super(NonEmptyCharField, self).validate(value)
-        if not value:
+        if not value.strip():
             raise ValidationError(self.error_messages["required"])