Merge branch 'hereje-feat/migrate-jest-to-vitest'

Author: williamstein

.github/workflows/test.yml

@@ -28,7 +28,6 @@ jobs:
       matrix:
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
         node-version:
-          - "18"
           - "20"
           - "22"
           - "24"

README.md

@@ -51,7 +51,7 @@ I've been adding load tests to the unit tests in various places. Generally speak
 
 We run GitHUB CI on the following:
 
-- nodejs versions 18, 20, 22, and 24
+- nodejs versions 20, 22, and 24
 
 **Development:**
 

jest.config.js

@@ -4,15 +4,17 @@ Simple round robin load balancer for websockets
 pnpm test ./simple-balancer-with-websockets.test.ts
 */
 
+import fetch from "node-fetch";
+import { once } from "node:events";
 import * as http from "node:http";
+import { afterAll, beforeAll, describe, expect, it } from "vitest";
 import * as httpProxy from "../..";
 import getPort from "../get-port";
-import { once } from "node:events";
-import fetch from "node-fetch";
 
 describe("A simple round-robin load balancer that supports websockets", () => {
   let addresses: Array<{ host: string, port: number }>;
-  it("lists the servers to use in our rotation.", async () => {
+  beforeAll(async () => {
+    // lists the servers to use in our rotation.
     addresses = [
       {
         host: "localhost",
@@ -121,7 +123,8 @@ describe("A simple round-robin load balancer that supports websockets", () => {
     ]);
   });
 
-  it("cleans up", () => {
+  afterAll(async() => {
+    // cleans up
     Object.values(servers).map((x: any) => x?.close());
   });
 });

lib/test/balancer/simple-balancer-with-websockets.test.ts

@@ -8,10 +8,12 @@ import * as http from "node:http";
 import * as httpProxy from "../..";
 import getPort from "../get-port";
 import fetch from "node-fetch";
+import { describe, it, expect, afterAll, beforeAll } from "vitest";
 
 describe("A simple round-robin load balancing strategy.", () => {
   let addresses: Array<{ host: string, port: number }>;
-  it("lists the servers to use in our rotation.", async () => {
+  beforeAll(async () => {
+    // lists the servers to use in our rotation.
     addresses = [
       {
         host: "localhost",
@@ -72,7 +74,8 @@ describe("A simple round-robin load balancing strategy.", () => {
     ]);
   });
 
-  it("cleans up", () => {
+  afterAll(async () => {
+    // cleans up
     Object.values(servers).map((x: any) => x?.close());
   });
 });

lib/test/balancer/simple-balancer.test.ts

@@ -11,6 +11,7 @@ import * as httpProxy from "../..";
 import log from "../log";
 import getPort from "../get-port";
 import fetch from "node-fetch";
+import { describe, it, expect, afterAll, beforeAll } from "vitest";
 
 export async function server() {
   const httpPort = await getPort();
@@ -20,9 +21,9 @@ export async function server() {
     res.writeHead(200, { "Content-Type": "text/plain" });
     res.write(
       "request successfully proxied to: " +
-        req.url +
-        "\n" +
-        JSON.stringify(req.headers, undefined, 2),
+      req.url +
+      "\n" +
+      JSON.stringify(req.headers, undefined, 2),
     );
     res.end();
   });
@@ -61,7 +62,8 @@ describe("tests proxying a basic http server", () => {
 
 describe("Load test against the basic proxy", () => {
   let x: { proxy: httpProxy.ProxyServer; target: http.Server; httpPort: number; proxyPort: number };
-  it("creates servers", async () => {
+  beforeAll(async () => {
+    // creates servers
     x = await server();
   });
 
@@ -108,7 +110,8 @@ describe("Load test against the basic proxy", () => {
     expect(elapsed).toBeLessThan(MAX_TIME);
   });
 
-  it("Cleans up", () => {
+  afterAll(async () => {
+    // Cleans up
     x.proxy.close();
     x.target.close();
   });

lib/test/http/basic-proxy.test.ts

@@ -2,6 +2,7 @@ import express from "express";
 import getPort from "../get-port";
 import ProxyServer, { createServer } from "../..";
 import http from "node:http";
+import {describe, it, expect} from 'vitest';
 
 // See https://github.com/sagemathinc/http-proxy-3/issues/6
 

lib/test/http/double-slashes.test.ts

@@ -2,6 +2,7 @@ import express from "express";
 import getPort from "../get-port";
 import ProxyServer, { createServer } from "../..";
 import http from "node:http";
+import { describe, it, expect } from "vitest";
 
 describe("test empty req.url", () => {
   let port: number, server: http.Server;
@@ -27,7 +28,7 @@ describe("test empty req.url", () => {
       res.end("Something went wrong.");
     });
     httpServer = http.createServer((req, res) => {
-      req.url = '' + new URL(`http://example.com${req.url}`).search;
+      req.url = "" + new URL(`http://example.com${req.url}`).search;
       proxy.web(req, res, { target: `http://localhost:${port}/test` });
     });
 
@@ -41,8 +42,8 @@ describe("test empty req.url", () => {
 
   it("get using the proxy", async () => {
     expect(await getProxy("")).toBe("Test Page!: {}");
-    expect(await getProxy("?foo")).toBe("Test Page!: {\"foo\":\"\"}");
-    expect(await getProxy("?foo=bar")).toBe("Test Page!: {\"foo\":\"bar\"}");
+    expect(await getProxy("?foo")).toBe('Test Page!: {"foo":""}');
+    expect(await getProxy("?foo=bar")).toBe('Test Page!: {"foo":"bar"}');
   });
 
   it("clean up", () => {

lib/test/http/empty-req-url.test.ts

@@ -7,6 +7,7 @@ import * as http from "node:http";
 import getPort from "../get-port";
 import log from "../log";
 import fetch from "node-fetch";
+import {describe, it, expect} from 'vitest';
 
 const CUSTOM_ERROR = "There was an error proxying your request";
 

lib/test/http/error-handling.test.ts

@@ -13,6 +13,7 @@ import log from "../log";
 import getPort from "../get-port";
 import wait from "../wait";
 import fetch from "node-fetch";
+import {describe, it, expect} from 'vitest';
 
 describe("Example of proxying over HTTP with additional forward proxy to a different server", () => {
   let ports: Record<'target' | 'forward' | 'proxy', number>;