Merge pull request #4008 from pestrada/3836-avoid-empty-comments

avoid posting empty comments

Changelog.md

@@ -1,5 +1,9 @@
 # Head
 
+## Bug fixes
+
+* avoid posting empty comments. [#3836](https://github.com/diaspora/diaspora/issues/3836)
+
 ## Refactor
 
 * Refactor people_controller#show and photos_controller#index [#4002](https://github.com/diaspora/diaspora/issues/4002)

app/assets/javascripts/app/views/comment_stream_view.js

@@ -39,9 +39,15 @@ app.views.CommentStream = app.views.Base.extend({
 
   createComment: function(evt) {
     if(evt){ evt.preventDefault(); }
-    this.model.comment(this.$(".comment_box").val())
+    
-    this.$(".comment_box").val("")
+    var commentText = $.trim(this.$('.comment_box').val());
+    if(commentText) {
+      this.model.comment(commentText);
+      this.$(".comment_box").val("");
       return this;
+    } else {
+      this.$(".comment_box").val("").focus();
+    }
   },
 
   appendComment: function(comment) {

spec/javascripts/app/views/comment_stream_view_spec.js

@@ -29,6 +29,26 @@ describe("app.views.CommentStream", function(){
     })
   })
   
+  describe("createComment", function() {
+    beforeEach(function() {
+      jasmine.Ajax.useMock();
+      this.view.render();
+      this.view.expandComments();
+    })
+    
+    it("submits the new comment when comment text is not empty", function() {
+      this.view.$(".comment_box").val('a new comment');
+      this.view.createComment();
+      expect(this.view.$(".comment-content p").text()).toEqual("a new comment");
+    })
+    
+    it("clears the comment box when there are only spaces", function() {
+      this.view.$(".comment_box").val('   ');
+      this.view.createComment();
+      expect(this.view.$(".comment_box").val()).toEqual("");
+    })
+  })
+
   describe("appendComment", function(){
     it("appends this.model as 'parent' to the comment", function(){
       var comment = new app.models.Comment(factory.comment())