From 0665733b0302ac7e743e4c131c7697741fa923a5 Mon Sep 17 00:00:00 2001
From: Jarred Sumner <jarred@jarredsumner.com>
Date: Sun, 6 Aug 2023 20:39:40 -0700
Subject: Fixes #4029 and fixes #4022 (#4032)

* Fixes #4029 and Fixes #4022

Fixes #4029

Fixes #4022

* Add test for all the fetches

---------

Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
---
 test/js/node/fs/node-fetch.test.js | 44 +++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'test/js/node/fs/node-fetch.test.js')

diff --git a/test/js/node/fs/node-fetch.test.js b/test/js/node/fs/node-fetch.test.js
index 33af3252d..c174917a7 100644
--- a/test/js/node/fs/node-fetch.test.js
+++ b/test/js/node/fs/node-fetch.test.js
@@ -1,4 +1,6 @@
 import fetch2, { fetch, Response, Request, Headers } from "node-fetch";
+import * as iso from "isomorphic-fetch";
+import * as vercelFetch from "@vercel/fetch";
 
 import { test, expect } from "bun:test";
 
@@ -8,26 +10,24 @@ test("node-fetch", () => {
   expect(Headers).toBe(globalThis.Headers);
 });
 
-test("node-fetch fetches", async () => {
-  const server = Bun.serve({
-    port: 0,
-    fetch(req, server) {
-      server.stop();
-      return new Response();
-    },
+for (const [impl, name] of [
+  [fetch, "node-fetch.fetch"],
+  [fetch2, "node-fetch.default"],
+  [fetch2.default, "node-fetch.default.default"],
+  [iso.fetch, "isomorphic-fetch.fetch"],
+  [iso.default.fetch, "isomorphic-fetch.default.fetch"],
+  [iso.default, "isomorphic-fetch.default"],
+  [vercelFetch.default(fetch), "@vercel/fetch.default"],
+]) {
+  test(name + " fetches", async () => {
+    const server = Bun.serve({
+      port: 0,
+      fetch(req, server) {
+        server.stop();
+        return new Response();
+      },
+    });
+    expect(await impl("http://" + server.hostname + ":" + server.port)).toBeInstanceOf(Response);
+    server.stop(true);
   });
-  expect(await fetch("http://" + server.hostname + ":" + server.port)).toBeInstanceOf(Response);
-  server.stop(true);
-});
-
-test("node-fetch.default fetches", async () => {
-  const server = Bun.serve({
-    port: 0,
-    fetch(req, server) {
-      server.stop();
-      return new Response();
-    },
-  });
-  expect(await fetch2("http://" + server.hostname + ":" + server.port)).toBeInstanceOf(Response);
-  server.stop(true);
-});
+}
-- 
cgit v1.2.3