Merge branch 'develop' into update-subclass-language-use-override

Author: KristjanESPERANTO

.github/workflows/automated-tests.yaml

@@ -12,6 +12,10 @@ on:
 permissions:
   contents: read
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   code-style-check:
     runs-on: ubuntu-latest

.github/workflows/electron-rebuild.yaml

@@ -21,12 +21,8 @@ jobs:
         run: node --run install-mm
       - name: Install @electron/rebuild
         run: npm install @electron/rebuild
-      - name: Install node-libgpiod deps
-        run: |
-          sudo apt-get update
-          sudo apt-get install gpiod libgpiod2 libgpiod-dev
-      - name: Install test library (node-libgpiod) to be rebuilded
-        run: npm install node-libgpiod
+      - name: Install test library (serialport) to be rebuilt
+        run: npm install serialport
       - name: Run electron-rebuild
         run: npx electron-rebuild
         continue-on-error: false

CHANGELOG.md

@@ -22,7 +22,9 @@ planned for 2026-01-01
 - [check_config] refactor: improve error handling (#3927)
 - [calendar] test: remove "Recurring event per timezone" test (#3929)
 - [calendar] chore: remove `requiresVersion: "2.1.0"` (#3932)
-- [tests] migrate from `jest` to `vitest` (#3940)
+- [tests] migrate from `jest` to `vitest` (#3940, #3941)
+- [ci] Add concurrency to automated tests workflow to cancel outdated runs (#3943)
+- [tests] replace `node-libgpiod` with `serialport` in electron-rebuild workflow (#3945)
 - [weatherprovider] update override warning wording (#3914)
 
 ### Fixed

js/server_functions.js

@@ -58,7 +58,10 @@ async function cors (req, res) {
 			res.send(data);
 		}
 	} catch (error) {
-		Log.error(error);
+		// Only log errors in non-test environments to keep test output clean
+		if (process.env.mmTestMode !== "true") {
+			Log.error(error);
+		}
 		res.send(error);
 	}
 }

modules/default/updatenotification/git_helper.js

@@ -183,7 +183,10 @@ class GitHelper {
 					this.gitResultList.push(gitInfo);
 				}
 			} catch (e) {
-				Log.error(`Failed to retrieve repo info for ${repo.module}: ${e}`);
+				// Only log errors in non-test environments to keep test output clean
+				if (process.env.mmTestMode !== "true") {
+					Log.error(`Failed to retrieve repo info for ${repo.module}: ${e}`);
+				}
 			}
 		}
 

package-lock.json

@@ -121,7 +121,7 @@
 		"vitest": "^4.0.6"
 	},
 	"optionalDependencies": {
-		"electron": "^38.3.0"
+		"electron": "^39.0.0"
 	},
 	"engines": {
 		"node": ">=22.20.0 <23 || >=24"

package.json

@@ -12,9 +12,8 @@ let config = {
 				maximumEntries: 1,
 				calendars: [
 					{
-						fetchInterval: 7 * 24 * 60 * 60 * 1000,
 						symbol: ["calendar-check", "google"],
-						url: "https://ics.calendarlabs.com/76/mm3137/US_Holidays.ics"
+						url: "http://localhost:8080/tests/mocks/12_events.ics"
 					}
 				]
 			}

tests/configs/modules/calendar/symboltest.js

@@ -1,19 +1,33 @@
 /**
- * Vitest setup file for module aliasing
+ * Vitest setup file for module aliasing and CI logging
  * This allows require("logger") to work in unit tests
  */
 
 const Module = require("node:module");
 const path = require("node:path");
 
+// Set test mode flag for application code to detect test environment
+process.env.mmTestMode = "true";
+
 // Store the original require
 const originalRequire = Module.prototype.require;
 
+// Track if we've already applied log level
+let logLevelApplied = false;
+
 // Override require to handle our custom aliases
 Module.prototype.require = function (id) {
 	// Handle "logger" alias
 	if (id === "logger") {
-		return originalRequire.call(this, path.resolve(__dirname, "../../js/logger.js"));
+		const logger = originalRequire.call(this, path.resolve(__dirname, "../../js/logger.js"));
+
+		// Suppress debug/info logs in CI to keep output clean
+		if (!logLevelApplied && process.env.CI === "true") {
+			logger.setLogLevel("ERROR");
+			logLevelApplied = true;
+		}
+
+		return logger;
 	}
 
 	// Handle all other requires normally