diff --git a/CHANGELOG.md b/CHANGELOG.md index a9309c57..8db90470 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ planned for 2026-01-01 - [core] refactor: replace `express-ipfilter` with lightweight custom middleware (#3917) - This fixes security issue [CVE-2023-42282](https://github.com/advisories/GHSA-78xj-cgh5-2h22), which is not very likely to be exploitable in MagicMirror² setups, but still should be fixed. - fixed the Environment Canada weather URL (#3912) and now converts a windspeed of 'calm' to 0 - fixed problems with daylight-saving-time in weather provider `openmeto` (#3930, #3931) +- [newsfeed] fixed header layout issue introduced with prettier njk linting (#3946) ### Updated diff --git a/modules/default/newsfeed/newsfeed.njk b/modules/default/newsfeed/newsfeed.njk index 9a91cb94..9eacc261 100644 --- a/modules/default/newsfeed/newsfeed.njk +++ b/modules/default/newsfeed/newsfeed.njk @@ -40,7 +40,7 @@ {% if (config.showSourceTitle and item.sourceTitle) or config.showPublishDate %}
{% if item.sourceTitle and config.showSourceTitle %} - {{ item.sourceTitle }}{% if config.showPublishDate %},{% else %}:{% endif %} + {{ item.sourceTitle }}{% if config.showPublishDate %}, {% else %}:{% endif %} {% endif %} {% if config.showPublishDate %}{{ item.publishDate }}:{% endif %}
@@ -63,7 +63,7 @@ {% if (config.showSourceTitle and sourceTitle) or config.showPublishDate %}
{% if sourceTitle and config.showSourceTitle %} - {{ escapeText(sourceTitle, config.dangerouslyDisableAutoEscaping) }}{% if config.showPublishDate %},{% else %}:{% endif %} + {{ escapeText(sourceTitle, config.dangerouslyDisableAutoEscaping) }}{% if config.showPublishDate %}, {% else %}:{% endif %} {% endif %} {% if config.showPublishDate %}{{ publishDate }}:{% endif %}
diff --git a/tests/electron/env_spec.js b/tests/electron/env_spec.js index b0f07c18..3351e1af 100644 --- a/tests/electron/env_spec.js +++ b/tests/electron/env_spec.js @@ -11,8 +11,9 @@ describe("Electron app environment", () => { }); it("should open browserwindow", async () => { - const module = await helpers.getElement("#module_0_helloworld"); - await expect(module.textContent()).resolves.toContain("Test Display Header"); + // Wait for module content to be rendered, not just the module wrapper + const moduleContent = await helpers.getElement("#module_0_helloworld .module-content"); + await expect(moduleContent.textContent()).resolves.toContain("Test Display Header"); expect(global.electronApp.windows()).toHaveLength(1); }); });