one assert per testcase

louislam · Feb 19, 2025 · 492d9f5 · 492d9f5
1 parent 725892c
commit 492d9f5
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 17 deletions.
diff --git a/server/monitor-types/websocket-upgrade.js b/server/monitor-types/websocket-upgrade.js
@@ -11,9 +11,8 @@ class WebSocketMonitorType extends MonitorType {
     async check(monitor, heartbeat, _server) {
         const [ message, code ] = await this.attemptUpgrade(monitor);
         heartbeat.status = code === 1000 ? UP : DOWN;
-        //heartbeat.msg = message;
-        heartbeat.msg = code; //unit testing
-        console.log(message); //temporary test to pass eslint check
+        heartbeat.msg = message;
+        console.log(code, message); //temp unit testing
     }
 
     /**

diff --git a/test/backend-test/test-websocket.js b/test/backend-test/test-websocket.js
@@ -18,9 +18,13 @@ describe("Websocket Test", {
             status: PENDING,
         };
 
+        const expected = {
+            msg: "Unexpected server response: 200",
+            status: DOWN,
+        };
+
         await websocketMonitor.check(monitor, heartbeat, {});
-        assert.strictEqual(heartbeat.status, DOWN);
-        assert.strictEqual(heartbeat.msg, undefined);
+        assert.deepStrictEqual(heartbeat, expected);
     });
 
     test("Secure Websocket", async () => {
@@ -36,14 +40,16 @@ describe("Websocket Test", {
             status: PENDING,
         };
 
+        const expected = {
+            msg: "101 - OK",
+            status: UP,
+        };
+
         await websocketMonitor.check(monitor, heartbeat, {});
-        assert.strictEqual(heartbeat.status, UP);
-        assert.strictEqual(heartbeat.msg, 1000);
+        assert.deepStrictEqual(heartbeat, expected);
     });
 
-    test("Insecure Websocket", {
-        skip: !!process.env.CI,
-    }, async () => {
+    test("Insecure Websocket", async () => {
         const websocketMonitor = new WebSocketMonitorType();
 
         const monitor = {
@@ -56,10 +62,13 @@ describe("Websocket Test", {
             status: PENDING,
         };
 
+        const expected = {
+            msg: "101 - OK",
+            status: UP,
+        };
+
         await websocketMonitor.check(monitor, heartbeat, {});
-        console.log("Insecure WS Test:", heartbeat.msg, heartbeat.status);
-        assert.strictEqual(heartbeat.status, UP);
-        assert.strictEqual(heartbeat.msg, 1000);
+        assert.deepStrictEqual(heartbeat, expected);
     });
 
     test("Test a non compliant WS server without ignore", async () => {
@@ -75,9 +84,13 @@ describe("Websocket Test", {
             status: PENDING,
         };
 
+        const expected = {
+            msg: "Invalid Sec-WebSocket-Accept header",
+            status: DOWN,
+        };
+
         await websocketMonitor.check(monitor, heartbeat, {});
-        assert.strictEqual(heartbeat.status, DOWN);
-        assert.strictEqual(heartbeat.msg, undefined);
+        assert.deepStrictEqual(heartbeat, expected);
     });
 
     test("Test a non compliant WS server with ignore", async () => {
@@ -93,8 +106,12 @@ describe("Websocket Test", {
             status: PENDING,
         };
 
+        const expected = {
+            msg: "101 - OK",
+            status: UP,
+        };
+
         await websocketMonitor.check(monitor, heartbeat, {});
-        assert.strictEqual(heartbeat.status, UP);
-        assert.strictEqual(heartbeat.msg, 1000);
+        assert.deepStrictEqual(heartbeat, expected);
     });
 });