fix: test

Signed-off-by: Victor Adossi <vadossi@cosmonic.com>

Author: vados-cosmonic

package-lock.json

@@ -1,5 +1,5 @@
 import { URL, fileURLToPath } from 'node:url';
-import { createServer } from 'node:net';
+import { createServer } from 'node:http';
 
 import { strictEqual, ok } from 'node:assert';
 
@@ -16,7 +16,6 @@ export const state = async () => {
 export const source = (testState) => {
   let port = testState?.port ? ':' + testState.port : '';
   const url = FETCH_URL + port;
-  console.error('[test] fetch.js visiting URL', url);
   return `
   export async function run () {
     const res = await fetch('${url}');
@@ -38,22 +37,22 @@ export async function test(run, testState) {
     throw new Error('missing port on test state');
   }
 
+  const url = FETCH_URL + (port ? ':' + port : '');
+
   // Run a local server on some port
-  console.error('[test] starting local server...');
   const server = createServer(async (req, res) => {
     res.writeHead(200, { 'Content-Type': 'application/json; charset=utf-8' });
     res.write(
       JSON.stringify({
         status: 'ok',
+        url,
       }),
     );
     res.end();
   }).listen(port);
 
   // Wait until the server is ready
-  console.error('[test] waiting for server to start...');
   let ready = false;
-  const url = FETCH_URL + (port ? ':' + port : '');
   while (!ready) {
     try {
       const res = await fetch(url);
@@ -63,8 +62,9 @@ export async function test(run, testState) {
     }
   }
 
-  console.error('[test] server started, running...');
   const { stdout, stderr } = await run();
   strictEqual(stderr, '');
-  strictEqual(stdout.trim(), FETCH_URL);
+  strictEqual(stdout.trim(), url);
+
+  server.close();
 }

test/builtins/fetch.js

@@ -25,23 +25,25 @@ const builtinsCases = await readdir(new URL('./builtins', import.meta.url));
 suite('Builtins', () => {
   for (const filename of builtinsCases) {
     const name = filename.slice(0, -3);
+    if (!name.includes("fetch")) { continue; }
     test(name, async () => {
+      const testModule = await import(`./builtins/${filename}`);
       const {
         state,
-        source,
         test: runTest,
         disableFeatures,
         enableFeatures,
-      } = await import(`./builtins/${filename}`);
+      } = testModule;
 
       // If an args object was provided, generate the arguments to feed to both
       // source generation (if necessary) and the test run itself
       let stateFn = state ?? noOp;
       const stateObj = await stateFn();
 
       // If the source is a function then invoke it to generate the source string, possibly with arguments
+      let source = testModule.source;
       if (typeof source === 'function') {
-        source(stateObj);
+        source = source(stateObj);
       }
 
       const { component } = await componentize(