From 799ee8bcfab2f71f5cbf2f1ac7dd25a31881ade3 Mon Sep 17 00:00:00 2001 From: oemel09 Date: Thu, 8 Apr 2021 08:38:29 +0200 Subject: [PATCH 1/7] Check showDescription setting for newsfeed module --- modules/default/newsfeed/newsfeed.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js index 441984f4..3881e0d6 100644 --- a/modules/default/newsfeed/newsfeed.js +++ b/modules/default/newsfeed/newsfeed.js @@ -135,7 +135,7 @@ Module.register("newsfeed", { sourceTitle: item.sourceTitle, publishDate: moment(new Date(item.pubdate)).fromNow(), title: item.title, - description: item.description + description: this.isShowingDescription ? item.description : null }; }, From 256d5ae14f2a5a30653808c5a8b306108339e1ac Mon Sep 17 00:00:00 2001 From: oemel09 Date: Thu, 8 Apr 2021 16:59:46 +0200 Subject: [PATCH 2/7] Rebases onto develop --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cdcffd6..f44ca69c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ _This release is scheduled to be released on 2021-04-01._ - Fix calendar start function logging inconsistency. - Fix updatenotification start function logging inconsistency. +- Checks and applies the showDescription setting for the newsfeed module again ## [2.15.0] - 2021-04-01 From a49962b8de73833aedc033fcce1ec5ff1c3ca5b2 Mon Sep 17 00:00:00 2001 From: oemel09 Date: Thu, 8 Apr 2021 16:48:29 +0200 Subject: [PATCH 3/7] Moves validation into template --- modules/default/newsfeed/newsfeed.js | 2 +- modules/default/newsfeed/newsfeed.njk | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js index 3881e0d6..441984f4 100644 --- a/modules/default/newsfeed/newsfeed.js +++ b/modules/default/newsfeed/newsfeed.js @@ -135,7 +135,7 @@ Module.register("newsfeed", { sourceTitle: item.sourceTitle, publishDate: moment(new Date(item.pubdate)).fromNow(), title: item.title, - description: this.isShowingDescription ? item.description : null + description: item.description }; }, diff --git a/modules/default/newsfeed/newsfeed.njk b/modules/default/newsfeed/newsfeed.njk index dc9ccad6..3544cd79 100644 --- a/modules/default/newsfeed/newsfeed.njk +++ b/modules/default/newsfeed/newsfeed.njk @@ -13,13 +13,15 @@
{{ title }}
-
- {% if config.truncDescription %} - {{ description | truncate(config.lengthDescription) }} - {% else %} - {{ description }} - {% endif %} -
+ {% if (config.showDescription) %} +
+ {% if config.truncDescription %} + {{ description | truncate(config.lengthDescription) }} + {% else %} + {{ description }} + {% endif %} +
+ {% endif %} {% elseif error %}
From cb67286bc3b30faa6a590f2e207e54e654761493 Mon Sep 17 00:00:00 2001 From: oemel09 Date: Thu, 8 Apr 2021 16:56:47 +0200 Subject: [PATCH 4/7] Adds test to validate that description is shown --- tests/configs/modules/newsfeed/default.js | 3 ++- tests/e2e/modules/newsfeed_spec.js | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/configs/modules/newsfeed/default.js b/tests/configs/modules/newsfeed/default.js index 94c9a47f..a26b7a91 100644 --- a/tests/configs/modules/newsfeed/default.js +++ b/tests/configs/modules/newsfeed/default.js @@ -27,7 +27,8 @@ let config = { title: "Rodrigo Ramirez Blog", url: "http://localhost:8080/tests/configs/data/feed_test_rodrigoramirez.xml" } - ] + ], + showDescription: true } } ] diff --git a/tests/e2e/modules/newsfeed_spec.js b/tests/e2e/modules/newsfeed_spec.js index dae3d86b..67606b2f 100644 --- a/tests/e2e/modules/newsfeed_spec.js +++ b/tests/e2e/modules/newsfeed_spec.js @@ -36,6 +36,10 @@ describe("Newsfeed module", function () { it("should show the newsfeed article", function () { return app.client.waitUntilTextExists(".newsfeed .newsfeed-title", "QPanel", 10000); }); + + it("should show the newsfeed description", function () { + return app.client.waitUntilTextExists(".newsfeed .newsfeed-desc", "Para instalar esta nueva versión", 10000); + }); }); describe("Custom configuration", function () { From fdb0c0acb3d52d7507e48b838d97f3bb039c94e9 Mon Sep 17 00:00:00 2001 From: oemel09 Date: Fri, 9 Apr 2021 08:05:19 +0200 Subject: [PATCH 5/7] Adds test to check that newsfeed description does not show up --- tests/configs/modules/newsfeed/default.js | 3 +-- tests/configs/modules/newsfeed/prohibited_words.js | 3 ++- tests/e2e/modules/newsfeed_spec.js | 8 ++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/configs/modules/newsfeed/default.js b/tests/configs/modules/newsfeed/default.js index a26b7a91..94c9a47f 100644 --- a/tests/configs/modules/newsfeed/default.js +++ b/tests/configs/modules/newsfeed/default.js @@ -27,8 +27,7 @@ let config = { title: "Rodrigo Ramirez Blog", url: "http://localhost:8080/tests/configs/data/feed_test_rodrigoramirez.xml" } - ], - showDescription: true + ] } } ] diff --git a/tests/configs/modules/newsfeed/prohibited_words.js b/tests/configs/modules/newsfeed/prohibited_words.js index e039385e..f9bfa5cf 100644 --- a/tests/configs/modules/newsfeed/prohibited_words.js +++ b/tests/configs/modules/newsfeed/prohibited_words.js @@ -27,7 +27,8 @@ let config = { url: "http://localhost:8080/tests/configs/data/feed_test_rodrigoramirez.xml" } ], - prohibitedWords: ["QPanel"] + prohibitedWords: ["QPanel"], + showDescription: true } } ] diff --git a/tests/e2e/modules/newsfeed_spec.js b/tests/e2e/modules/newsfeed_spec.js index 67606b2f..b0f81133 100644 --- a/tests/e2e/modules/newsfeed_spec.js +++ b/tests/e2e/modules/newsfeed_spec.js @@ -37,8 +37,8 @@ describe("Newsfeed module", function () { return app.client.waitUntilTextExists(".newsfeed .newsfeed-title", "QPanel", 10000); }); - it("should show the newsfeed description", function () { - return app.client.waitUntilTextExists(".newsfeed .newsfeed-desc", "Para instalar esta nueva versión", 10000); + it("should not show the newsfeed description", function () { + return !app.client.waitUntilTextExists(".newsfeed .newsfeed-desc", "Para instalar esta nueva versión", 10000); }); }); @@ -50,6 +50,10 @@ describe("Newsfeed module", function () { it("should not show articles with prohibited words", function () { return app.client.waitUntilTextExists(".newsfeed .newsfeed-title", "Problema VirtualBox", 10000); }); + + it("should show the newsfeed description", function () { + return app.client.waitUntilTextExists(".newsfeed .newsfeed-desc", "Después de una actualización de Debian", 10000); + }); }); describe("Invalid configuration", function () { From acdcdc55bc95f43d677be2cf9c5b098d06b7888a Mon Sep 17 00:00:00 2001 From: oemel09 Date: Fri, 9 Apr 2021 08:07:37 +0200 Subject: [PATCH 6/7] Adjusts parenthesis in template to be consistent --- modules/default/newsfeed/newsfeed.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default/newsfeed/newsfeed.njk b/modules/default/newsfeed/newsfeed.njk index 3544cd79..e63a8054 100644 --- a/modules/default/newsfeed/newsfeed.njk +++ b/modules/default/newsfeed/newsfeed.njk @@ -13,7 +13,7 @@
{{ title }}
- {% if (config.showDescription) %} + {% if config.showDescription %}
{% if config.truncDescription %} {{ description | truncate(config.lengthDescription) }} From a4dfd15888198412f6687acbbded2078df9a14c8 Mon Sep 17 00:00:00 2001 From: oemel09 Date: Sat, 10 Apr 2021 09:13:14 +0200 Subject: [PATCH 7/7] Fixes tests for newsfeed description --- tests/e2e/modules/newsfeed_spec.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/e2e/modules/newsfeed_spec.js b/tests/e2e/modules/newsfeed_spec.js index b0f81133..0a8f505f 100644 --- a/tests/e2e/modules/newsfeed_spec.js +++ b/tests/e2e/modules/newsfeed_spec.js @@ -1,4 +1,5 @@ const helpers = require("../global-setup"); +const expect = require("chai").expect; const describe = global.describe; const it = global.it; @@ -37,8 +38,10 @@ describe("Newsfeed module", function () { return app.client.waitUntilTextExists(".newsfeed .newsfeed-title", "QPanel", 10000); }); - it("should not show the newsfeed description", function () { - return !app.client.waitUntilTextExists(".newsfeed .newsfeed-desc", "Para instalar esta nueva versión", 10000); + it("should NOT show the newsfeed description", async () => { + await app.client.waitUntilTextExists(".newsfeed .newsfeed-title", "QPanel", 10000); + const events = await app.client.$$(".newsfeed .newsfeed-desc"); + return expect(events.length).equals(0); }); }); @@ -51,8 +54,10 @@ describe("Newsfeed module", function () { return app.client.waitUntilTextExists(".newsfeed .newsfeed-title", "Problema VirtualBox", 10000); }); - it("should show the newsfeed description", function () { - return app.client.waitUntilTextExists(".newsfeed .newsfeed-desc", "Después de una actualización de Debian", 10000); + it("should show the newsfeed description", async () => { + await app.client.waitUntilTextExists(".newsfeed .newsfeed-title", "Problema VirtualBox", 10000); + const events = await app.client.$$(".newsfeed .newsfeed-desc"); + return expect(events.length).equals(1); }); });