Fixed unauthorized test

geckosio · May 7, 2024 · 97fbb89 · 97fbb89
1 parent af1bbc0
commit 97fbb89
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 21 deletions.
diff --git a/test/e2e/unauthorized.html b/test/e2e/unauthorized.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <script src="/.tmp/geckos.io-client.latest.min.js"></script>
@@ -7,7 +7,7 @@
     <script>
       'use strict'
 
-      var channel = geckos({ port: 4000, authorization: 'some-unique-token' })
+      var channel = geckos({ port: 4001, authorization: 'some-unique-token' })
 
       channel.onConnect(error => {
         if (error) {

diff --git a/test/e2e/unauthorized.test.js b/test/e2e/unauthorized.test.js
@@ -5,9 +5,19 @@ import http from 'http'
 import path from 'path'
 
 import { __dirname } from './_dirname.js'
+import { sleep, serverListenPromise, kill } from '../helpers.js'
 
 const app = express()
+
 const server = http.createServer(app)
+const sockets = new Set()
+server.on('connection', socket => {
+  sockets.add(socket)
+  server.once('close', () => {
+    sockets.delete(socket)
+  })
+})
+
 let theToken
 const io = geckos({
   authorization: async token => {
@@ -19,21 +29,23 @@ const io = geckos({
 app.use('/', Static(path.join(__dirname, '../')))
 
 io.addServer(server)
-server.listen(4000)
+await serverListenPromise(server, 4001)
 
 io.onConnection(ch => {})
 
 describe('connection', () => {
-  test('should have no connection', done => {
+  test('should have no connection', async () => {
     let connections = 0
+
     io.onConnection(ch => {
       connections++
     })
 
-    setTimeout(() => {
-      expect(connections).toBe(0)
-      done()
-    }, 1000)
+    await page.goto('http://localhost:4001/e2e/unauthorized.html', { timeout: 2000 })
+
+    await sleep(2000)
+
+    expect(connections).toBe(0)
   })
 })
 
@@ -43,18 +55,6 @@ describe('unauthorized', () => {
   })
 })
 
-page.goto('http://localhost:4000/e2e/unauthorized.html')
-
 afterAll(async () => {
-  const close = () => {
-    return new Promise(resolve => {
-      server.close(() => {
-        resolve()
-      })
-    })
-  }
-
-  await close()
-  // await page.close()
-  // await browser.close()
+  await kill(server, sockets)
 })
diff --git a/test/helpers.js b/test/helpers.js
@@ -11,3 +11,14 @@ export const kill = async (httpServer, sockets = new Set()) => {
     })
   })
 }
+
+export const serverListenPromise = (httpServer, port) => {
+  return new Promise(resolve => {
+    httpServer.listen(port, () => {
+      console.log('listening on port', port)
+      resolve()
+    })
+  })
+}
+
+export const sleep = (ms = 1000) => new Promise(r => setTimeout(r, ms))