From 73f70eb9e55b87af80ba6f361d65c20c3ec74b83 Mon Sep 17 00:00:00 2001
From: SamTv12345 <samtv12345@samtv12345.com>
Date: Tue, 20 Aug 2024 15:28:55 +0200
Subject: [PATCH] Fixed favicon test

---
 src/node/hooks/express.ts          |  1 +
 src/tests/backend/specs/favicon.ts | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/node/hooks/express.ts b/src/node/hooks/express.ts
index 5bfefc13a..16a25dffc 100644
--- a/src/node/hooks/express.ts
+++ b/src/node/hooks/express.ts
@@ -56,6 +56,7 @@ const closeServer = async () => {
       await events.once(socketsEvents, 'updated');
     }
     await p;
+    await appInstance?.shutdown()
     appInstance!.close()
     clearTimeout(timeout);
     exports.server = null;
diff --git a/src/tests/backend/specs/favicon.ts b/src/tests/backend/specs/favicon.ts
index 1a1a9ece7..977d927f2 100644
--- a/src/tests/backend/specs/favicon.ts
+++ b/src/tests/backend/specs/favicon.ts
@@ -4,8 +4,10 @@ import {MapArrayType} from "../../../node/types/MapType";
 
 const assert = require('assert').strict;
 const common = require('../common');
-const fs = require('fs');
-const fsp = fs.promises;
+import {mkdtempSync, readFile, readFileSync} from 'fs';
+import {rmSync, unlinkSync} from "node:fs";
+
+
 const path = require('path');
 const settings = require('../../../node/utils/Settings');
 const superagent = require('superagent');
@@ -14,20 +16,20 @@ describe(__filename, function () {
   let agent:any;
   let backupSettings:MapArrayType<any>;
   let skinDir: string;
-  let wantCustomIcon: boolean;
-  let wantDefaultIcon: boolean;
-  let wantSkinIcon: boolean;
+  let wantCustomIcon: Buffer;
+  let wantDefaultIcon: Buffer;
+  let wantSkinIcon: Buffer;
 
   before(async function () {
     agent = await common.init();
-    wantCustomIcon = await fsp.readFile(path.join(__dirname, 'favicon-test-custom.png'));
-    wantDefaultIcon = await fsp.readFile(path.join(settings.root, 'src', 'static', 'favicon.ico'));
-    wantSkinIcon = await fsp.readFile(path.join(__dirname, 'favicon-test-skin.png'));
+    wantCustomIcon = readFileSync(path.join(__dirname, 'favicon-test-custom.png'));
+    wantDefaultIcon = readFileSync(path.join(settings.root, 'src', 'static', 'favicon.ico'));
+    wantSkinIcon = readFileSync(path.join(__dirname, 'favicon-test-skin.png'));
   });
 
   beforeEach(async function () {
     backupSettings = {...settings};
-    skinDir = await fsp.mkdtemp(path.join(settings.root, 'src', 'static', 'skins', 'test-'));
+    skinDir = mkdtempSync(path.join(settings.root, 'src', 'static', 'skins', 'test-'));
     settings.skinName = path.basename(skinDir);
   });
 
@@ -36,8 +38,8 @@ describe(__filename, function () {
     delete settings.skinName;
     Object.assign(settings, backupSettings);
     try {
-      await fsp.unlink(path.join(skinDir, 'favicon.ico'));
-      await fsp.rm(skinDir, {recursive: true});
+      unlinkSync(path.join(skinDir, 'favicon.ico'));
+      rmSync(skinDir, {recursive: true});
     } catch (err) { /* intentionally ignored */ }
   });