Drop various old Node test workarounds & skips

This also notably ensures a few tests that were skipped in browsers
previously are properly covered, now that we can know what the behaviour
will be even without knowing the Node version.

Author: pimterry

test/integration/form-data.spec.ts

@@ -3,8 +3,8 @@ import {
     expect,
     File,
     fetch as fetchPolyfill,
-    NATIVE_FETCH_SUPPORTED,
-    nodeSatisfies
+    nodeSatisfies,
+    isNode
 } from "../test-utils";
 
 const fetch = globalThis.fetch ?? fetchPolyfill;
@@ -63,11 +63,6 @@ describe("Body getXFormData methods", () => {
     });
 
     describe("given multipart/form-data", () => {
-        before(function () {
-            // Polyfill fetch encodes polyfill FormData into "[object FormData]", which is not parsable
-            if (!nodeSatisfies(NATIVE_FETCH_SUPPORTED)) this.skip();
-        });
-
         it("should automatically parse as form data", async () => {
             const endpoint = await server.forPost("/mocked-endpoint").thenReply(200);
 

test/integration/handlers/broken-response.spec.ts

@@ -10,7 +10,6 @@ import {
     openRawTlsSocket,
     http2ProxyRequest,
     nodeSatisfies,
-    SOCKET_RESET_SUPPORTED,
     BROKEN_H1_OVER_H2_TUNNELLING
 } from "../../test-utils";
 
@@ -33,14 +32,12 @@ describe("Broken response handlers", function () {
         });
 
         it("should allow forcibly resetting the connection", async function () {
-            if (!nodeSatisfies(SOCKET_RESET_SUPPORTED)) this.skip();
-
             await server.forGet('/mocked-endpoint').thenResetConnection();
 
             let result = await fetch(server.urlFor('/mocked-endpoint')).catch(e => e);
 
             expect(result).to.be.instanceof(Error);
-            expect(result.message).to.contain('read ECONNRESET');
+            expect(result.message).to.contain(isNode ? 'read ECONNRESET' : 'Failed to fetch');
         });
 
 
@@ -71,8 +68,6 @@ describe("Broken response handlers", function () {
 
         nodeOnly(() => {
             it("should allow forcibly closing proxied connections", async function () {
-                if (!nodeSatisfies(SOCKET_RESET_SUPPORTED)) this.skip();
-
                 await server.forGet('example.com').thenResetConnection();
 
                 const tunnel = await openRawTlsSocket(server);
@@ -93,8 +88,6 @@ describe("Broken response handlers", function () {
             });
 
             it("should allow forcibly closing h2-over-h2 proxy connections", async function () {
-                if (!nodeSatisfies(SOCKET_RESET_SUPPORTED)) this.skip();
-
                 await server.forGet('example.com').thenResetConnection();
 
                 const response: any = await http2ProxyRequest(server, `https://example.com`)
@@ -107,7 +100,6 @@ describe("Broken response handlers", function () {
             });
 
             it("should allow forcibly closing h1.1-over-h2 proxy connections", async function () {
-                if (!nodeSatisfies(SOCKET_RESET_SUPPORTED)) this.skip();
                 if (nodeSatisfies(BROKEN_H1_OVER_H2_TUNNELLING)) this.skip();
 
                 await server.forGet('example.com').thenResetConnection();

test/integration/https.spec.ts

@@ -12,8 +12,7 @@ import {
     openRawSocket,
     openRawTlsSocket,
     http2ProxyRequest,
-    nodeSatisfies,
-    DETAILED_TLS_ERROR_CODES
+    nodeSatisfies
 } from "../test-utils";
 import { streamToBuffer } from '../../src/util/buffer-utils';
 
@@ -451,11 +450,7 @@ describe("When configured for HTTPS", () => {
                     });
                     throw new Error('Expected connection to fail');
                 } catch (e: any) {
-                    expect(e.code).to.equal(
-                        nodeSatisfies(DETAILED_TLS_ERROR_CODES)
-                            ? 'ERR_SSL_TLSV1_ALERT_PROTOCOL_VERSION'
-                            : 'ECONNRESET'
-                    );
+                    expect(e.code).to.equal('ERR_SSL_TLSV1_ALERT_PROTOCOL_VERSION');
                 }
             });
 
@@ -468,11 +463,7 @@ describe("When configured for HTTPS", () => {
                     });
                     throw new Error('Expected connection to fail');
                 } catch (e: any) {
-                    expect(e.code).to.equal(
-                        nodeSatisfies(DETAILED_TLS_ERROR_CODES)
-                            ? 'ERR_SSL_TLSV1_ALERT_PROTOCOL_VERSION'
-                            : 'ECONNRESET'
-                    );
+                    expect(e.code).to.equal('ERR_SSL_TLSV1_ALERT_PROTOCOL_VERSION');
                 }
             });
 

test/integration/proxying/https-proxying.spec.ts

@@ -15,8 +15,7 @@ import {
     makeDestroyable,
     DestroyableServer,
     ignoreNetworkError,
-    nodeSatisfies,
-    SOCKET_RESET_SUPPORTED
+    nodeSatisfies
 } from "../../test-utils";
 import { CA } from "../../../src/util/tls";
 import { streamToBuffer } from "../../../src/util/buffer-utils";
@@ -368,11 +367,7 @@ nodeOnly(() => {
                     }).catch(e => e);
 
                     expect(result).to.be.instanceof(Error);
-                    if (nodeSatisfies(SOCKET_RESET_SUPPORTED)) {
-                        expect((result as any).message).to.include('ECONNRESET');
-                    } else {
-                        expect((result as any).message).to.include('socket hang up');
-                    }
+                    expect((result as any).message).to.include('ECONNRESET');
                 });
 
                 it("should tag failed requests", async () => {

test/test-utils.ts

@@ -301,9 +301,6 @@ export async function startDnsServer(callback: (question: dns2.DnsQuestion) => s
 export const nodeSatisfies = (range: string) =>
     isNode && semver.satisfies(process.version, range);
 
-export const DETAILED_TLS_ERROR_CODES = ">=18";
-export const NATIVE_FETCH_SUPPORTED = ">=18";
-export const SOCKET_RESET_SUPPORTED = ">=18.3";
 export const BROKEN_H1_OVER_H2_TUNNELLING = "^18.8";
 export const DEFAULT_KEEP_ALIVE = ">=19";
 export const FIXED_KEEP_ALIVE_BEHAVIOUR = ">=20";