qunitx 0.3.8 → 0.4.0

package/lib/commands/run.js

@@ -16,21 +16,22 @@ import writeOutputStaticFiles from '../setup/write-output-static-files.js';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
 export default async function(config) {
-  if (config.before) {
-    await runUserModule(`${process.cwd()}/${config.before}`, config, 'before');
-  }
-
   if (config.browser) {
     let cachedContent = await buildCachedContent(config, config.htmlPaths);
     let [connections, _] = await Promise.all([
       setupBrowser(config, cachedContent),
       writeOutputStaticFiles(config, cachedContent)
     ]);
+    config.expressApp = connections.server;
 
     if (config.watch) {
       setupKeyboardEvents(config, cachedContent, connections);
     }
 
+    if (config.before) {
+      await runUserModule(`${process.cwd()}/${config.before}`, config, 'before');
+    }
+
     await runTestsInBrowser(config, cachedContent, connections);
 
     if (config.watch) {
@@ -60,6 +61,10 @@ export default async function(config) {
       setupKeyboardEvents(config);
     }
 
+    if (config.before) {
+      await runUserModule(`${process.cwd()}/${config.before}`, config, 'before');
+    }
+
     await runTestsInNode(Object.keys(config.fsTree), config);
 
     if (config.watch) {

package/lib/setup/browser.js

@@ -11,7 +11,7 @@ export default async function setupBrowser(config = {
     setupWebServer(config, cachedContent),
     Puppeteer.launch({
       executablePath: process.env.CHROME_BIN || null,
-      headless: true,
+      headless: 'new',
       args: ['--no-sandbox', '--disable-gpu', '--remote-debugging-port=0', '--window-size=1440,900']
     }),
   ]);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "qunitx",
   "type": "module",
-  "version": "0.3.8",
+  "version": "0.4.0",
   "description": "Experimental improvements, suggestions for qunit CLI",
   "author": "Izel Nakri",
   "license": "MIT",
@@ -37,13 +37,13 @@
     "@nanoexpress/middleware-static-serve": "^1.0.4",
     "cheerio": "^1.0.0-rc.10",
     "chokidar": "^3.5.3",
-    "esbuild": "^0.14.25",
+    "esbuild": "^0.17.18",
     "js-yaml": "^4.1.0",
     "kleur": "^4.1.5",
-    "nanoexpress": "^6.1.0",
+    "nanoexpress": "^6.2.1",
     "picomatch": "^2.3.1",
-    "puppeteer": "13.5.2",
-    "recursive-lookup": "1.0.0",
+    "puppeteer": "20.1.2",
+    "recursive-lookup": "1.1.0",
     "ts-node": "^10.7.0"
   },
   "devDependencies": {
@@ -52,11 +52,11 @@
     "express": "^4.17.3",
     "prettier": "^2.8.8",
     "qunit": "^2.18.0",
-    "qunitx": "^0.3.6",
+    "qunitx": "^0.3.8",
     "release-it": "^15.10.3"
   },
   "volta": {
-    "node": "19.9.0"
+    "node": "20.1.0"
   },
   "prettier": {
     "printWidth": 100,

package/shims/nodejs-assert.js

@@ -0,0 +1,26 @@
+import assert from 'node:assert';
+
+// TODO: write test cases for these
+export default {
+  async: assert.async,
+  deepEqual: assert.deepStrictEqual,
+  equal: assert.strictEqual,
+  expect: assert.expect,
+  false: assert.false,
+  notDeepEqual: assert.notDeepStrictEqual,
+  notEqual: assert.notEqual,
+  notOk: assert.notOk,
+  notPropContains: assert.notPropContains,
+  notPropEqual: assert.notPropEqual,
+  notStrictEqual: assert.notStrictEqual,
+  ok: assert.ok,
+  propContains: assert.propContains,
+  pushResult: assert.pushResult,
+  rejects: assert.rejects,
+  step: assert.step,
+  strictEqual: assert.strictEqual,
+  throws: assert.throws,
+  timeout: assert.timeout,
+  true: assert.true,
+  verifySteps: assert.verifySteps
+};

package/shims/nodejs.js

@@ -0,0 +1,81 @@
+import { run, describe, it, before, after, beforeEach, afterEach } from 'node:test';
+import assert from './nodejs-assert.js';
+
+export const module = async function(moduleName, _hooks, moduleContent) {
+  let targetModuleContent = moduleContent ? moduleContent : _hooks;
+  let targetHooks = moduleContent ? _hooks : undefined;
+
+  const hooks = targetHooks || { before: undefined, after: undefined, beforeEach: undefined, afterEach: undefined};
+  const { before: _before, after: _after, beforeEach: _beforeEach, afterEach: _afterEach } = hooks;
+
+  // NOTE: add { concurrency: true }
+  return describe(moduleName, async function() {
+    if (_before) {
+      before(_before);
+    }
+
+    if (_after) {
+      after(_after);
+    }
+
+    if (_beforeEach) {
+      beforeEach(_beforeEach);
+    }
+
+    if (_afterEach) {
+      afterEach(_afterEach);
+    }
+
+    return await targetModuleContent(hooks);
+  });
+}
+
+export const test = async function(testName, testContent) {
+  // return it(testName, { concurrency: true }, async function() {
+  // NOTE: also add timeout here!! then changable when QUnit implemented correctly
+  // NOTE: add { concurrency: true }
+  return it(testName, async function() {
+    return await testContent(assert);
+  });
+}
+
+
+// NOTE: later maybe expose these as well:
+
+// import QUnit from './vendor/qunit.js';
+
+// QUnit.config.autostart = false;
+
+// export const isLocal = QUnit.isLocal;
+// export const on = QUnit.on;
+// export const test = QUnit.test;
+// export const skip = QUnit.skip;
+// export const start = QUnit.start;
+// export const is = QUnit.is;
+// export const extend = QUnit.extend;
+// export const stack = QUnit.stack;
+// export const onUnhandledRejection = QUnit.onUnhandledRejection;
+// export const assert = QUnit.assert;
+// export const dump = QUnit.dump;
+// export const done = QUnit.done;
+// export const testStart = QUnit.testStart;
+// export const moduleStart = QUnit.moduleStart;
+// export const version = QUnit.version;
+// export const module = QUnit.module;
+// export const todo = QUnit.todo;
+// export const only = QUnit.only;
+// export const config = QUnit.config;
+// export const objectType = QUnit.objectType;
+// export const load = QUnit.load;
+// export const onError = QUnit.onError;
+// export const pushFailure = QUnit.pushFailure;
+// export const equiv = QUnit.equiv;
+// export const begin = QUnit.begin;
+// export const log = QUnit.log;
+// export const testDone = QUnit.testDone;
+// export const moduleDone = QUnit.moduleDone;
+// export const diff = QUnit.diff;
+
+// export default Object.assign(QUnit, {
+//   QUnitxVersion: '0.0.1'
+// });