@exodus/test 1.0.0-rc.41 → 1.0.0-rc.43

package/bin/bundle.js

@@ -28,8 +28,6 @@ const readSnapshots = async (files, resolvers) => {
   return snapshots
 }
 
-// These packages throw on import
-const blockedDeps = ['@pollyjs/adapter-node-http', '@pollyjs/node-server']
 const loadPipeline = [
   function (source, filepath) {
     return source
@@ -37,18 +35,6 @@ const loadPipeline = [
       .replace(/\b(__dirname|import\.meta\.dirname)\b/g, JSON.stringify(dirname(filepath)))
       .replace(/\b(__filename|import\.meta\.filename)\b/g, JSON.stringify(filepath))
   },
-  function (source, filepath) {
-    // Just a convenience wrapper to show pretty errors instead of generic bundle-apis/empty/module-throw.cjs
-    for (const pkg of blockedDeps) {
-      const str = `require(${JSON.stringify(pkg)})`
-      assert(!str.includes("'"))
-      const err = `module unsupported in bundled form: ${pkg}\n       loaded from ${filepath}`
-      const rep = `((() => { throw new Error(${JSON.stringify(err)}) })())`
-      for (const sub of [str, str.replaceAll('"', "'")]) source = source.replace(sub, rep)
-    }
-
-    return source
-  },
 ]
 
 const options = {}
@@ -256,8 +242,6 @@ export const build = async (...files) => {
       bindings: api('empty/function-throw.cjs'),
       'node-gyp-build': api('empty/function-throw.cjs'),
       ws: api('ws.cjs'),
-      // unsupported deps
-      ...Object.fromEntries(blockedDeps.map((n) => [n, api('empty/module-throw.cjs')])),
     },
     sourcemap: ['hermes', 'jsc', 'd8'].includes(options.platform) ? 'inline' : 'linked', // FIXME?
     sourcesContent: false,

package/bin/index.js

@@ -185,6 +185,11 @@ const resolveRequire = (query) => require.resolve(query)
 const resolveImport = import.meta.resolve && ((query) => fileURLToPath(import.meta.resolve(query)))
 
 const args = []
+
+if (haveModuleMocks && ['node:test', 'node:pure'].includes(options.engine)) {
+  args.push('--experimental-test-module-mocks')
+}
+
 if (options.pure) {
   if (options.bundle) {
     assert(!options.coverage, `Can not use --coverage with ${options.engine} engine`)
@@ -200,7 +205,6 @@ if (options.pure) {
 } else if (options.engine === 'node:test') {
   args.push('--test', '--no-warnings=ExperimentalWarning', '--test-reporter=spec')
 
-  if (haveModuleMocks) args.push('--experimental-test-module-mocks')
   if (haveSnapshots) args.push('--experimental-test-snapshots')
 
   if (options.writeSnapshots) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/test",
-  "version": "1.0.0-rc.41",
+  "version": "1.0.0-rc.43",
   "author": "Exodus Movement, Inc.",
   "description": "A test suite runner",
   "homepage": "https://github.com/ExodusMovement/test",
@@ -110,7 +110,7 @@
     "c8": "^9.1.0",
     "constants-browserify": "^1.0.0",
     "crypto-browserify": "^3.12.0",
-    "esbuild": "~0.21.5",
+    "esbuild": "~0.23.1",
     "events": "^3.3.0",
     "expect": "^29.7.0",
     "fast-glob": "^3.2.11",
@@ -124,7 +124,7 @@
     "stream-browserify": "^3.0.0",
     "text-encoding": "^0.7.0",
     "timers-browserify": "^2.0.12",
-    "tsx": "^4.16.2",
+    "tsx": "^4.19.0",
     "url": "^0.11.0",
     "util": "^0.12.5"
   },

package/src/engine.pure.cjs

@@ -391,6 +391,14 @@ const mock = {
   },
 }
 
+if (process.env.EXODUS_TEST_ENGINE === 'node:pure') {
+  // Try load module mocks from node:test, if present
+  try {
+    const nodeTest = require('node:test')
+    mock.module = nodeTest.mock.module.bind(nodeTest.mock)
+  } catch {}
+}
+
 const beforeEach = (fn) => context.hooks.beforeEach.push(fn)
 const afterEach = (fn) => context.hooks.afterEach.push(fn)
 const before = (fn) => context.hooks.before.push(fn)

package/src/jest.environment.js

@@ -30,51 +30,4 @@ export const specialEnvironments = {
       } catch {}
     },
   },
-
-  // Reproduces setup-polly-jest/jest-environment-node and hacks into 'setup-polly-jest'.pollyJest
-  'setup-polly-jest/jest-environment-node': {
-    dependencies: ['@pollyjs/core', 'setup-polly-jest', 'setup-polly-jest/lib/common'],
-    setup: async (require, engine) => {
-      const { getTestNamePath } = await import('./dark.cjs')
-      // polly has bad defer impl in case if it finds MessageChannel but not process.* (e.g. on deno), forever blocking
-      const { MessageChannel } = globalThis
-      if (MessageChannel) globalThis.MessageChannel = undefined
-      const { Polly } = require('@pollyjs/core')
-      const pollyJest = require('setup-polly-jest')
-      const {
-        JestPollyGlobals,
-        createPollyContextAccessor,
-      } = require('setup-polly-jest/lib/common')
-      if (MessageChannel) globalThis.MessageChannel = MessageChannel
-      const pollyGlobals = new JestPollyGlobals(globalThis)
-      pollyGlobals.isJestPollyEnvironment = true
-      pollyJest.setupPolly = (options) => {
-        if (!pollyGlobals.isJestPollyEnvironment) return
-
-        engine.before(() => {
-          pollyGlobals.isPollyActive = true
-          pollyGlobals.pollyContext.options = options
-        })
-
-        engine.after(() => {
-          pollyGlobals.isPollyActive = false
-          pollyGlobals.pollyContext.options = null
-        })
-
-        return createPollyContextAccessor(pollyGlobals)
-      }
-
-      engine.beforeEach((t) => {
-        if (!pollyGlobals.isPollyActive) return
-        const name = getTestNamePath(t).join('/')
-        pollyGlobals.pollyContext.polly = new Polly(name, pollyGlobals.pollyContext.options)
-      })
-
-      engine.afterEach(async () => {
-        if (!pollyGlobals.pollyContext.polly) return
-        await pollyGlobals.pollyContext.polly.stop()
-        pollyGlobals.pollyContext.polly = null
-      })
-    },
-  },
 }

package/src/jest.js

@@ -203,6 +203,10 @@ export const jest = {
       },
       websocketRecord,
       websocketReplay,
+      websocketNoop: () => {
+        globalThis.WebSocket = jest.fn()
+        return globalThis.WebSocket
+      },
     },
   },
   setTimeout: (x) => {

package/src/jest.snapshot.js

@@ -94,7 +94,10 @@ const snapInline = (obj, inline) => {
   assert(inline !== undefined, 'Inline Snapshots generation is not supported')
   assert(typeof inline === 'string')
   maybeSetupSerializers()
-  getAssert().strictEqual(serialize(obj).trim(), inline.trim())
+  let trimmed = inline.trim()
+  const prefix = inline.slice(0, inline.indexOf(trimmed)).split('\n').find(Boolean)
+  if (prefix && /^[ \t]+$/u.test(prefix)) trimmed = trimmed.replaceAll(`\n${prefix}`, '\n')
+  getAssert().strictEqual(serialize(obj).trim(), trimmed)
 }
 
 const deepMerge = (obj, matcher) => {