From 5248975a9d934560e60c8c6b09942b9db3a3fcce Mon Sep 17 00:00:00 2001
From: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com>
Date: Mon, 14 Jul 2025 21:40:52 +0200
Subject: [PATCH 1/2] refactor: extract constants for weather electron tests

---
 CHANGELOG.md                           |  1 +
 tests/electron/modules/weather_spec.js | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcdf993a93..6afc00c97d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ Thanks to: @dathbe.
 - [core] Enhance system information logging format and include additional env and RAM details (#3839, #3843)
 - [refactor] Add new file `js/module_functions.js` to move code used in several modules to one place (#3837)
 - [tests] refactor: simplify jest config file (#3844)
+- [tests] refactor: extract constants for weather electron tests
 
 ### Updated
 
diff --git a/tests/electron/modules/weather_spec.js b/tests/electron/modules/weather_spec.js
index 40776eafba..b9cc667541 100644
--- a/tests/electron/modules/weather_spec.js
+++ b/tests/electron/modules/weather_spec.js
@@ -2,6 +2,13 @@ const helpers = require("../helpers/global-setup");
 const weatherHelper = require("../helpers/weather-setup");
 const { cleanupMockData } = require("../../utils/weather_mocker");
 
+const CURRENT_WEATHER_CONFIG = "tests/configs/modules/weather/currentweather_default.js";
+const SUNRISE_DATE = "13 Jan 2019 00:30:00 GMT";
+const SUNSET_DATE = "13 Jan 2019 12:30:00 GMT";
+const SUN_EVENT_SELECTOR = ".weather .normal.medium span:nth-child(4)";
+const EXPECTED_SUNRISE_TEXT = "7:00 am";
+const EXPECTED_SUNSET_TEXT = "3:45 pm";
+
 describe("Weather module", () => {
 	afterEach(async () => {
 		await helpers.stopApplication();
@@ -10,21 +17,23 @@ describe("Weather module", () => {
 
 	describe("Current weather with sunrise", () => {
 		beforeAll(async () => {
-			await weatherHelper.startApp("tests/configs/modules/weather/currentweather_default.js", "13 Jan 2019 00:30:00 GMT");
+			await weatherHelper.startApp(CURRENT_WEATHER_CONFIG, SUNRISE_DATE);
 		});
 
 		it("should render sunrise", async () => {
-			await expect(weatherHelper.getText(".weather .normal.medium span:nth-child(4)", "7:00 am")).resolves.toBe(true);
+			const isSunriseRendered = await weatherHelper.getText(SUN_EVENT_SELECTOR, EXPECTED_SUNRISE_TEXT);
+			expect(isSunriseRendered).toBe(true);
 		});
 	});
 
 	describe("Current weather with sunset", () => {
 		beforeAll(async () => {
-			await weatherHelper.startApp("tests/configs/modules/weather/currentweather_default.js", "13 Jan 2019 12:30:00 GMT");
+			await weatherHelper.startApp(CURRENT_WEATHER_CONFIG, SUNSET_DATE);
 		});
 
 		it("should render sunset", async () => {
-			await expect(weatherHelper.getText(".weather .normal.medium span:nth-child(4)", "3:45 pm")).resolves.toBe(true);
+			const isSunsetRendered = await weatherHelper.getText(SUN_EVENT_SELECTOR, EXPECTED_SUNSET_TEXT);
+			expect(isSunsetRendered).toBe(true);
 		});
 	});
 });

From 7c658a82ef51b1ebc7f9bef5b00555fb03c8e4de Mon Sep 17 00:00:00 2001
From: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com>
Date: Mon, 14 Jul 2025 22:16:54 +0200
Subject: [PATCH 2/2] docs: add PR id

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6afc00c97d..0b4db3cb9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@ Thanks to: @dathbe.
 - [core] Enhance system information logging format and include additional env and RAM details (#3839, #3843)
 - [refactor] Add new file `js/module_functions.js` to move code used in several modules to one place (#3837)
 - [tests] refactor: simplify jest config file (#3844)
-- [tests] refactor: extract constants for weather electron tests
+- [tests] refactor: extract constants for weather electron tests (#3845)
 
 ### Updated