test: fix leaky globals

hapijs · Jun 26, 2024 · 47dca53 · 47dca53
1 parent 349e36d
commit 47dca53
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/lib/client.js b/lib/client.js
@@ -104,7 +104,9 @@
 
         options = options || {};
 
-        this._isBrowser = typeof WebSocket !== 'undefined' && global.window !== undefined;
+        // $lab:coverage:off$
+        this._isBrowser = typeof WebSocket !== 'undefined' && typeof window !== 'undefined';
+        // $lab:coverage:on$
 
         if (!this._isBrowser) {
             options.ws = options.ws || {};

diff --git a/test/client.js b/test/client.js
@@ -54,6 +54,8 @@ describe('Client', () => {
                 delete global.WebSocket;
             }
 
+            delete global.window;
+
             Nes.Client.WebSocket = Ws;
 
             return new Ws(...args);

diff --git a/test/listener.js b/test/listener.js
@@ -106,15 +106,8 @@ describe('Listener', () => {
         await server.register({ plugin: Nes, options: { auth: false, origin: ['http://localhost:12345'] } });
 
         await server.start();
-
-        // mimick a server connection because WebSocket in node 22
-        // does not work like it does in the browser
-        const orig = global.WebSocket;
-        delete global.WebSocket;
         const client = new Nes.Client(getUri(server.info), { ws: { origin: 'http://localhost:12345' } });
         await client.connect();
-
-        global.WebSocket = orig;
         client.disconnect();
         await server.stop();
     });