cleanup jasmine tests

and added changelog entry for bugfix #4005

app/assets/javascripts/app/collections/comments.js

@@ -19,12 +19,9 @@ app.collections.Comments = Backbone.Collection.extend({
       success: function() {
         comment.set({author: app.currentUser.toJSON(), parent: self.post })
         self.add(comment)
-      },
+      }
-      error: function() {
+    });
 
-       }
+    return deferred;
-    })
-
-    return deferred
   }
-});
+});

app/assets/javascripts/app/models/post/interactions.js

@@ -82,7 +82,11 @@ app.models.Post.Interactions = Backbone.Model.extend({
     var self = this;
 
     this.comments.make(text).fail(function () {
-      alert(Diaspora.I18n.t("failed_to_post_message"));
+      flash = new Diaspora.Widgets.FlashMessages;
+      flash.render({
+        success: false,
+        notice: Diaspora.I18n.t("failed_to_post_message")
+      });
     }).done(function() {
       self.trigger('change') //updates after sync
     });

spec/javascripts/app/views/comment_stream_view_spec.js

@@ -1,8 +1,8 @@
 describe("app.views.CommentStream", function(){
   beforeEach(function(){
-    this.view = new app.views.CommentStream({model : factory.post()})
+    this.view = new app.views.CommentStream({model : factory.post()});
-    loginAs({})
+    loginAs({});
-  })
+  });
 
   describe("binds", function() {
     it("re-renders on a commentsExpanded trigger", function(){
@@ -10,8 +10,8 @@ describe("app.views.CommentStream", function(){
       this.view.setupBindings();
       this.view.model.trigger("commentsExpanded");
       expect(this.view.render).toHaveBeenCalled();
-    })
+    });
-  })
+  });
 
   describe("postRenderTemplate", function(){
     it("applies infield labels", function(){
@@ -19,53 +19,65 @@ describe("app.views.CommentStream", function(){
       this.view.postRenderTemplate()
       expect($.fn.placeholder).toHaveBeenCalled()
       expect($.fn.placeholder.mostRecentCall.object.selector).toBe("textarea")
-    })
+    });
 
     it("autoResizes the new comment textarea", function(){
       spyOn($.fn, "autoResize")
       this.view.postRenderTemplate()
       expect($.fn.autoResize).toHaveBeenCalled()
       expect($.fn.autoResize.mostRecentCall.object.selector).toBe("textarea")
-    })
+    });
-  })
+  });
 
   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() {
+    context("submission", function() {
-      this.view.$(".comment_box").val('a new comment');
+      beforeEach(function() {
-      this.view.createComment();
+        this.view.$(".comment_box").val('a new comment');
-      comments = mostRecentAjaxRequest();
+        this.view.createComment();
-      params = JSON.parse(comments.params)
-      expect(params.text).toEqual("a new comment");
-    })
 
-    it("comment doesn't get added if the submission fails", function(){
+        this.request = mostRecentAjaxRequest();
-      this.view.render();
+      });
-      var form = this.view.$("form")
+
-      var submitCallback = jasmine.createSpy().andReturn(false);form.submit(submitCallback);
+      it("fires an AJAX request", function() {
-      var e = $.Event("keydown", { keyCode: 13 });
+        params = JSON.parse(this.request.params);
-      e.shiftKey = false;
+        // TODO: use this, once jasmine-ajax is updated to latest version
-      this.view.keyDownOnCommentBox(e);
+        //params = this.request.data();
-      expect(submitCallback).not.toHaveBeenCalled();
+
-    })
+        expect(params.text).toEqual("a new comment");
+      });
+
+      it("adds the comment to the view", function() {
+        this.request.response({status: 200});
+        expect(this.view.$(".comment-content p").text()).toEqual("a new comment");
+      });
+
+      it("doesn't add the comment to the view, when the request fails", function(){
+        Diaspora.I18n.loadLocale({failed_to_post_message: "posting failed!"});
+        this.request.response({status: 500});
+
+        expect(this.view.$(".comment-content p").text()).not.toEqual("a new comment");
+        expect($('*[id^="flash"]')).toBeErrorFlashMessage("posting failed!");
+      });
+    });
 
     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("");
-    })
+    });
 
     it("resets comment box height", function() {
       this.view.$(".comment_box").val('a new comment');
       this.view.createComment();
       expect(this.view.$(".comment_box").attr("style")).not.toContain("height");
-    })
+    });
-  })
+  });
 
   describe("appendComment", function(){
     it("appends this.model as 'parent' to the comment", function(){
@@ -74,8 +86,8 @@ describe("app.views.CommentStream", function(){
       spyOn(comment, "set")
       this.view.appendComment(comment)
       expect(comment.set).toHaveBeenCalled()
-    })
+    });
-  })
+  });
 
   describe("expandComments", function() {
     it("refills the comment textbox on success", function() {
@@ -90,8 +102,8 @@ describe("app.views.CommentStream", function(){
       mostRecentAjaxRequest().response({ comments : [] });
 
       expect(this.view.$("textarea").val()).toEqual("great post!");
-    })
+    });
-  })
+  });
 
   describe("pressing a key when typing on the new comment box", function(){
     it("should not submit the form when enter key is pressed", function(){
@@ -104,7 +116,7 @@ describe("app.views.CommentStream", function(){
       this.view.keyDownOnCommentBox(e);
 
       expect(submitCallback).not.toHaveBeenCalled();
-    })
+    });
 
     it("should submit the form when enter is pressed with ctrl", function(){
       this.view.render();
@@ -117,7 +129,7 @@ describe("app.views.CommentStream", function(){
       this.view.keyDownOnCommentBox(e);
 
       expect(submitCallback).toHaveBeenCalled();
-    })
+    });
-  })
+  });
 
-})
+});

spec/javascripts/helpers/SpecHelper.js

@@ -25,7 +25,34 @@ beforeEach(function() {
   $.extend(Page.prototype, Diaspora.EventBroker.extend(Diaspora.BaseWidget));
 
   Diaspora.page = new Page();
-  Diaspora.page.publish("page/ready", [$(document.body)])
+  Diaspora.page.publish("page/ready", [$(document.body)]);
+
+
+  // matches flash messages with success/error and contained text
+  var flashMatcher = function(flash, id, text) {
+    textContained = true;
+    if( text ) {
+      textContained = (flash.text().indexOf(text) !== -1);
+    }
+
+    return flash.is(id) &&
+           flash.hasClass('expose') &&
+           textContained;
+  };
+
+  // add custom matchers for flash messages
+  this.addMatchers({
+    toBeSuccessFlashMessage: function(containedText) {
+      var flash = this.actual;
+      return flashMatcher(flash, '#flash_notice', containedText);
+    },
+
+    toBeErrorFlashMessage: function(containedText) {
+      var flash = this.actual;
+      return flashMatcher(flash, '#flash_error', containedText);
+    }
+  });
+
 });
 
 afterEach(function() {