feat(ses-ava): import test from @endo/ses-ava/prepare-endo.js (#2133)

packages/bundle-source/test/test-bigint-transform.js

@@ -1,6 +1,7 @@
 // @ts-check
 import url from 'url';
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
+
 import bundleSource from '../src/index.js';
 
 test('bigint transform', async t => {

packages/bundle-source/test/test-circular.js

@@ -1,5 +1,6 @@
 import url from 'url';
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
+
 import bundleSource from '../src/index.js';
 
 function evaluate(src, endowments) {

packages/bundle-source/test/test-comment.js

@@ -1,5 +1,5 @@
-// eslint-disable-next-line import/order
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
+
 import url from 'url';
 import { decodeBase64 } from '@endo/base64';
 import { parseArchive } from '@endo/compartment-mapper/import-archive.js';

packages/bundle-source/test/test-explicit.js

@@ -2,7 +2,8 @@ import { rollup } from 'rollup';
 import { resolve as pathResolve } from 'path';
 import resolvePlugin from '@rollup/plugin-node-resolve';
 import url from 'url';
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
+
 import bundleSource from '../src/index.js';
 
 test('explicit authority', async t => {

packages/bundle-source/test/test-external-fs.js

@@ -1,5 +1,6 @@
 import url from 'url';
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
+
 import bundleSource from '../src/index.js';
 
 function evaluate(src, endowments) {

packages/bundle-source/test/test-integrity.js

@@ -1,5 +1,6 @@
 import url from 'url';
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
+
 import bundleSource from '../src/index.js';
 
 test('integrity check', async t => {

packages/bundle-source/test/test-tool-command.js

@@ -1,11 +1,8 @@
-import '@endo/init';
+import test from '@endo/ses-ava/prepare-endo.js';
+
 import url from 'url';
-import rawTest from 'ava';
-import { wrapTest } from '@endo/ses-ava';
 import { execava } from './execava.js';
 
-const test = wrapTest(rawTest);
-
 const cwd = url.fileURLToPath(new URL('..', import.meta.url));
 const opts = { cwd };
 

packages/bundle-source/test/test-tool-library.js

@@ -1,12 +1,9 @@
 /* global process */
-import '@endo/init';
+import test from '@endo/ses-ava/prepare-endo.js';
+
 import url from 'url';
-import rawTest from 'ava';
-import { wrapTest } from '@endo/ses-ava';
 import { makeNodeBundleCache } from '../cache.js';
 
-const test = wrapTest(rawTest);
-
 test('bundle-source library is concurrency safe', async t => {
   const dest = url.fileURLToPath(new URL('../bundles', import.meta.url));
   const bundleEntry = url.fileURLToPath(

packages/captp/test/test-crosstalk.js

@@ -1,6 +1,5 @@
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
 
-// eslint-disable-next-line import/order
 import { Far } from '@endo/marshal';
 import { makeLoopback, E } from '../src/loopback.js';
 

packages/captp/test/test-disco.js

@@ -1,6 +1,5 @@
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
 
-// eslint-disable-next-line import/order
 import { Far } from '@endo/marshal';
 import { E, makeCapTP } from '../src/captp.js';
 

packages/captp/test/test-export-hook.js

@@ -1,8 +1,7 @@
 // @ts-check
 /* global globalThis */
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
 
-// eslint-disable-next-line import/order
 import { Far } from '@endo/marshal';
 import { E, makeLoopback } from '../src/loopback.js';
 

packages/captp/test/test-finalizing-map.js

@@ -1,4 +1,4 @@
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
 
 import { detectEngineGC } from './engine-gc.js';
 import { makeGcAndFinalize } from './gc-and-finalize.js';

packages/captp/test/test-gc.js

@@ -1,6 +1,5 @@
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
 
-// eslint-disable-next-line import/order
 import { Far } from '@endo/marshal';
 import { E, makeLoopback } from '../src/loopback.js';
 

packages/captp/test/test-loopback.js

@@ -1,7 +1,6 @@
 /* global setTimeout */
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
 
-// eslint-disable-next-line import/order
 import { Far } from '@endo/marshal';
 import { E, makeLoopback } from '../src/loopback.js';
 

packages/captp/test/test-trap.js

@@ -1,5 +1,4 @@
-// eslint-disable-next-line import/order
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
 
 import { Worker } from 'worker_threads';
 import url from 'url';

packages/common/test/test-apply-labeling-error.js

@@ -1,6 +1,5 @@
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
 
-// eslint-disable-next-line import/order
 import { Fail } from '@endo/errors';
 import { applyLabelingError } from '../apply-labeling-error.js';
 

packages/common/test/test-from-unique-entries.js

@@ -1,4 +1,4 @@
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
 import { fromUniqueEntries } from '../from-unique-entries.js';
 
 test('test fromUniqueEntries', async t => {

packages/common/test/test-ident-checker.js

@@ -1,4 +1,4 @@
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
 import { identChecker } from '../ident-checker.js';
 
 test('test identChecker', async t => {

packages/common/test/test-list-difference.js

@@ -1,4 +1,4 @@
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
 import { listDifference } from '../list-difference.js';
 
 test('test listDifference', async t => {

packages/common/test/test-make-array-iterator.js

@@ -1,4 +1,4 @@
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
 import { makeArrayIterator } from '../make-array-iterator.js';
 
 // Also serves as an adequate test of make-iterator.js

packages/common/test/test-object-map.js

@@ -1,4 +1,4 @@
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
 import { objectMap } from '../object-map.js';
 
 test('test objectMap', async t => {

packages/common/test/test-object-meta-assign.js

@@ -1,4 +1,4 @@
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
 import { objectMetaAssign } from '../object-meta-assign.js';
 
 test('test objectMetaAssign', async t => {

packages/common/test/test-object-meta-map.js

@@ -1,4 +1,4 @@
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
 import { objectMetaMap } from '../object-meta-map.js';
 
 const { getOwnPropertyDescriptors, getPrototypeOf } = Object;

packages/common/test/test-throw-labeled.js

@@ -1,4 +1,4 @@
-import { test } from './prepare-test-env-ava.js';
+import test from '@endo/ses-ava/prepare-endo.js';
 import { throwLabeled } from '../throw-labeled.js';
 
 test('test throwLabeled', async t => {

packages/daemon/test/test-pubsub.js

@@ -1,15 +1,11 @@
 // @ts-check
 /* eslint-disable no-await-in-loop */
 
-import '@endo/init/debug.js';
+import test from '@endo/ses-ava/prepare-endo.js';
 
-import rawTest from 'ava';
-import { wrapTest } from '@endo/ses-ava';
 import { makePromiseKit } from '@endo/promise-kit';
 import { makeChangeTopic } from '../src/pubsub.js';
 
-const test = wrapTest(rawTest);
-
 test('change topic supports parallel subscriptions', async (/** @type {import('ava').Assertions} */ t) => {
   const { publisher, subscribe } = makeChangeTopic();
 

packages/daemon/test/test-serial-jobs.js

@@ -1,13 +1,8 @@
 /* global setTimeout */
-import '@endo/init/debug.js';
-
-import rawTest from 'ava';
-import { wrapTest } from '@endo/ses-ava';
+import test from '@endo/ses-ava/prepare-endo.js';
 
 import { makeSerialJobs } from '../src/serial-jobs.js';
 
-const test = wrapTest(rawTest);
-
 const delay = () => new Promise(resolve => setTimeout(resolve, 1));
 
 test('performs operations in expected order (sync functions)', async t => {

packages/errors/test/test-index.js

@@ -1,5 +1,6 @@
 // Sets up a SES environment with 'assert' global
-import { test } from './prepare-test-env-ava.js';
+import '@endo/lockdown/commit-debug.js';
+import test from 'ava';
 
 import { assert, throwRedacted } from '../index.js';
 

packages/evasive-transform/test/prepare-test-env-ava.js → packages/evasive-transform/test/prepare-test-env-ava-fixture.js

@@ -1,14 +1,8 @@
 import path from 'node:path';
 import fs from 'node:fs/promises';
 import url from 'url';
-import rawTest from 'ava';
 
-// eslint-disable-next-line import/no-extraneous-dependencies
-import '@endo/init/debug.js';
-
-// eslint-disable-next-line import/no-extraneous-dependencies
-// @ts-expect-error - no types
-import { wrapTest } from '@endo/ses-ava';
+import test from '@endo/ses-ava/prepare-endo.js';
 
 /**
  * Path to fixture's bundled source code
@@ -34,16 +28,6 @@ const fixtureSourceMapPath = path.resolve(
   ),
 );
 
-/**
- * @typedef TransformsTestContext
- * @property {string} source - Fixture source
- * @property {string} sourceMap - Fixture source map
- * @property {string} sourceUrl - Relative fixture source filepath
- */
-
-/** @type {import('ava').TestFn<TransformsTestContext>} */
-export const test = wrapTest(rawTest);
-
 /**
  * Put fixture into the test context
  */
@@ -61,3 +45,5 @@ test.before(async t => {
     'Absolute source URL will befoul snapshots',
   );
 });
+
+export { test };

packages/evasive-transform/test/test-evade-censor.js

@@ -1,5 +1,5 @@
 import { evadeCensor } from '../src/index.js';
-import { test } from './prepare-test-env-ava.js';
+import { test } from './prepare-test-env-ava-fixture.js';
 
 /**
  * Removes all linefeeds from string

packages/evasive-transform/test/test-location-unmapper.js

@@ -1,6 +1,6 @@
 import babelParser from '@babel/parser';
 import { makeLocationUnmapper } from '../src/location-unmapper.js';
-import { test } from './prepare-test-env-ava.js';
+import { test } from './prepare-test-env-ava-fixture.js';
 
 const { parse: parseBabel } = babelParser;
 

packages/evasive-transform/test/test-transform-comment.js

@@ -1,4 +1,4 @@
-import { test } from './prepare-test-env-ava.js';
+import { test } from './prepare-test-env-ava-fixture.js';
 import { transformComment } from '../src/transform-comment.js';
 
 test('transformComment() - Node type becomes CommentBlock', async t => {
@@ -31,7 +31,7 @@ test('transformComment() - rewrite suspicious import(...)', async t => {
   const comment = /** @type {import('@babel/types').Comment} */ ({
     type: 'CommentBlock',
     value: `/**
- * @type {import('c:\\My Documents\\user.js')} 
+ * @type {import('c:\\My Documents\\user.js')}
  */`,
   });
   transformComment(comment);

packages/eventual-send/package.json

@@ -40,7 +40,6 @@
   },
   "devDependencies": {
     "@endo/lockdown": "^1.0.4",
-    "@endo/ses-ava": "^1.1.2",
     "ava": "^5.3.0",
     "c8": "^7.14.0",
     "tsd": "^0.28.1"

packages/eventual-send/test/test-deep-send.js

@@ -2,8 +2,8 @@
 // automated test. Rather, its purpose is just to run it to see what a
 // deep stack looks like.
 
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { test } from './prepare-test-env-ava.js';
+import '@endo/lockdown/commit-debug.js';
+import test from 'ava';
 
 import { E } from './get-hp.js';
 

packages/eventual-send/test/test-deep-stacks.js

@@ -2,7 +2,8 @@
 // automated test. Rather, its purpose is just to run it to see what a
 // deep stack looks like.
 
-import { test } from './prepare-test-env-ava.js';
+import '@endo/lockdown/commit-debug.js';
+import test from 'ava';
 
 import { E } from './get-hp.js';
 

packages/eventual-send/test/test-e.js

@@ -1,4 +1,5 @@
-import { test } from './prepare-test-env-ava.js';
+import '@endo/lockdown/commit-debug.js';
+import test from 'ava';
 
 import { E, HandledPromise } from './get-hp.js';
 

packages/eventual-send/test/test-eventual-send.js

@@ -1,5 +1,6 @@
 /* global setTimeout */
-import { test } from './prepare-test-env-ava.js';
+import '@endo/lockdown/commit-debug.js';
+import test from 'ava';
 
 import { HandledPromise } from './get-hp.js';