From 6ae2df2f9e8ee80f5a8d17c5808696880e8b82c0 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 17 Aug 2017 04:08:33 +0200 Subject: [PATCH 1/3] Fix missing timeagos for comments in the single post view --- app/assets/javascripts/app/views/comment_stream_view.js | 4 +++- spec/javascripts/app/views/comment_stream_view_spec.js | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/views/comment_stream_view.js b/app/assets/javascripts/app/views/comment_stream_view.js index d63272717..2a1b81612 100644 --- a/app/assets/javascripts/app/views/comment_stream_view.js +++ b/app/assets/javascripts/app/views/comment_stream_view.js @@ -118,7 +118,8 @@ app.views.CommentStream = app.views.Base.extend({ // on post ownership in the Comment view. comment.set({parent : this.model.toJSON()}); - var commentHtml = new this.CommentView({model: comment}).render().el; + var commentView = new this.CommentView({model: comment}); + var commentHtml = commentView.render().el; var commentBlocks = this.$(".comments div.comment.media"); this._moveInsertPoint(comment.get("created_at"), commentBlocks); if (this._insertPoint >= commentBlocks.length) { @@ -128,6 +129,7 @@ app.views.CommentStream = app.views.Base.extend({ } else { commentBlocks.eq(this._insertPoint).before(commentHtml); } + commentView.renderPluginWidgets(); }, removeComment: function(comment) { diff --git a/spec/javascripts/app/views/comment_stream_view_spec.js b/spec/javascripts/app/views/comment_stream_view_spec.js index c003bb0bd..284b16c7a 100644 --- a/spec/javascripts/app/views/comment_stream_view_spec.js +++ b/spec/javascripts/app/views/comment_stream_view_spec.js @@ -267,6 +267,14 @@ describe("app.views.CommentStream", function(){ expect(this.view.$(".comments div.comment.media").length).toEqual(6); expect(this.view.$(".comments div.comment.media div.comment-content p").text()).toEqual("123456"); }); + + it("calls renderPluginWidgets", function() { + var comment = factory.comment(); + this.view.CommentView = app.views.Comment; + spyOn(app.views.Comment.prototype, "renderPluginWidgets"); + this.view.appendComment(comment); + expect(app.views.Comment.prototype.renderPluginWidgets).toHaveBeenCalled(); + }); }); describe("removeComment", function() { From fdff13e542329b5569bb364beef4e0f5133d664f Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 17 Aug 2017 04:08:51 +0200 Subject: [PATCH 2/3] Enable tooltips for comment timeagos closes #7547 --- app/assets/javascripts/app/views/comment_view.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/app/views/comment_view.js b/app/assets/javascripts/app/views/comment_view.js index 6ca7a4355..788344478 100644 --- a/app/assets/javascripts/app/views/comment_view.js +++ b/app/assets/javascripts/app/views/comment_view.js @@ -4,6 +4,7 @@ app.views.Comment = app.views.Content.extend({ templateName: "comment", className : "comment media", + tooltipSelector: "time", events : function() { return _.extend({}, app.views.Content.prototype.events, { From aa8d46da0cb3303303c9baf13fb4cb4ac9a6e493 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Thu, 17 Aug 2017 05:17:30 +0200 Subject: [PATCH 3/3] Wait for post to be deleted before continuing closes #7548 --- features/step_definitions/custom_web_steps.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/features/step_definitions/custom_web_steps.rb b/features/step_definitions/custom_web_steps.rb index f15a8dd68..812a66f34 100644 --- a/features/step_definitions/custom_web_steps.rb +++ b/features/step_definitions/custom_web_steps.rb @@ -109,6 +109,7 @@ When /^I click to delete the first post$/ do accept_alert do step "I prepare the deletion of the first post" end + expect(find(".stream")).to have_no_css(".stream-element.loaded.deleting") end When /^I click to hide the first post$/ do