Add test for supertest call proxying for IPv6, make import style consistent

Author: davidje13

test/helpers/echoserver.mjs

@@ -1,4 +1,4 @@
-import http from 'http';
+import { createServer } from 'node:http';
 import { WebSocketServer } from 'ws';
 
 export const echo = (ws, req) => {
@@ -31,7 +31,7 @@ export const echo = (ws, req) => {
 };
 
 export default () => {
-  const server = http.createServer();
+  const server = createServer();
   new WebSocketServer({ server }).on('connection', echo);
   return server;
 };

test/helpers/errorserver.mjs

@@ -1,7 +1,7 @@
-import http from 'http';
+import { createServer } from 'node:http';
 
 export default () => {
-  const server = http.createServer((req, res) => {
+  const server = createServer((req, res) => {
     res.writeHead(404);
     res.end();
   });

test/helpers/subprotocolserver.mjs

@@ -1,10 +1,10 @@
-import http from 'http';
+import { createServer } from 'node:http';
 import { WebSocketServer } from 'ws';
 
 const SUPPORTED_SUBPROTOCOL = 'supported_subprotocol';
 
 export default () => {
-  const server = http.createServer();
+  const server = createServer();
   // eslint-disable-next-line no-new
   new WebSocketServer({
     server,

test/package/commonjs.js

@@ -1,3 +1,4 @@
+const { createServer } = require('node:http');
 const defaultRequire = require('superwstest');
 
 if (typeof defaultRequire !== 'function') {
@@ -8,6 +9,16 @@ if (typeof defaultRequire.default !== 'function') {
   throw new Error("require('superwstest').default did not return superwstest function");
 }
 
-if (typeof defaultRequire('http://localhost').get !== 'function') {
-  throw new Error('supertest proxy not connected');
-}
+// test proxying to supertest
+const server = createServer((req, res) => {
+  res.writeHead(req.url === '/path' ? 200 : 404);
+  res.end();
+});
+
+server.listen(0, '::1', async (err) => {
+  if (err) {
+    throw err;
+  }
+  await defaultRequire(server).get('/path').expect(200);
+  server.close();
+});

test/package/es6modules.mjs

@@ -1,9 +1,20 @@
+import { createServer } from 'node:http';
 import defaultImport from 'superwstest';
 
 if (typeof defaultImport !== 'function') {
   throw new Error("import 'superwstest' did not return superwstest function");
 }
 
-if (typeof defaultImport('http://localhost').get !== 'function') {
-  throw new Error('supertest proxy not connected');
-}
+// test proxying to supertest
+const server = createServer((req, res) => {
+  res.writeHead(req.url === '/path' ? 200 : 404);
+  res.end();
+});
+
+server.listen(0, '::1', async (err) => {
+  if (err) {
+    throw err;
+  }
+  await defaultImport(server).get('/path').expect(200);
+  server.close();
+});

test/package/typescript.ts

@@ -1,6 +1,6 @@
 import request from 'superwstest';
-import { createServer as httpCreateServer } from 'http';
-import { createServer as httpsCreateServer } from 'https';
+import { createServer as httpCreateServer } from 'node:http';
+import { createServer as httpsCreateServer } from 'node:https';
 import { WebSocketServer } from 'ws';
 
 // this file just checks types; the code is not executed

test/superwstest-servers.test.mjs

@@ -1,5 +1,5 @@
-import http from 'http';
-import https from 'https';
+import http from 'node:http';
+import https from 'node:https';
 import { WebSocket, WebSocketServer } from 'ws';
 import { echo } from './helpers/echoserver.mjs';
 import withScopedRequest from './helpers/withScopedRequest.mjs';

test/superwstest.test.mjs

@@ -1,5 +1,5 @@
+import { promisify } from 'node:util';
 import WebSocket from 'ws';
-import { promisify } from 'util';
 import makeEchoServer from './helpers/echoserver.mjs';
 import withServer from './helpers/withServer.mjs';
 import withScopedRequest from './helpers/withScopedRequest.mjs';