refactor(vat-data): use own prepare-test-env-ava.js

Agoric · Aug 28, 2023 · 0c1730a · 0c1730a
1 parent 2ffcef2
commit 0c1730a
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 8 deletions.
diff --git a/packages/vat-data/package.json b/packages/vat-data/package.json
@@ -32,6 +32,9 @@
   "ava": {
     "require": [
       "@endo/init/debug.js"
+    ],
+    "files": [
+      "test/**/test-*.js"
     ]
   },
   "publishConfig": {

diff --git a/packages/vat-data/test/prepare-test-env-ava.js b/packages/vat-data/test/prepare-test-env-ava.js
@@ -0,0 +1,9 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
+import './prepare-test-env.js';
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { wrapTest } from '@endo/ses-ava';
+import rawTest from 'ava';
+
+/** @type {typeof rawTest} */
+export const test = wrapTest(rawTest);
diff --git a/packages/vat-data/test/prepare-test-env.js b/packages/vat-data/test/prepare-test-env.js
@@ -0,0 +1 @@
+import '@agoric/swingset-liveslots/tools/prepare-test-env.js';
diff --git a/packages/vat-data/test/absent.test.js → packages/vat-data/test/test-absent.js b/packages/vat-data/test/absent.test.js → packages/vat-data/test/test-absent.js
diff --git a/packages/vat-data/test/test-durable-classes.js b/packages/vat-data/test/test-durable-classes.js
@@ -1,8 +1,8 @@
 // Modeled on test-heap-classes.js
 
-import '@agoric/swingset-liveslots/tools/prepare-test-env.js';
+import { test } from './prepare-test-env-ava.js';
 
-import test from 'ava';
+// eslint-disable-next-line import/order
 import { M } from '@agoric/store';
 import {
   makeKindHandle,

diff --git a/packages/vat-data/test/test-prepare.js b/packages/vat-data/test/test-prepare.js
@@ -1,8 +1,8 @@
 // Modeled on test-heap-classes.js
 
-import '@agoric/swingset-liveslots/tools/prepare-test-env.js';
+import { test } from './prepare-test-env-ava.js';
 
-import test from 'ava';
+// eslint-disable-next-line import/order
 import { M } from '@agoric/store';
 import {
   prepareExoClass,

diff --git a/packages/vat-data/test/present.test.js → packages/vat-data/test/test-present.js b/packages/vat-data/test/present.test.js → packages/vat-data/test/test-present.js
diff --git a/packages/vat-data/test/test-scalar-only-keys.js b/packages/vat-data/test/test-scalar-only-keys.js
@@ -1,8 +1,8 @@
 // From https://github.com/Agoric/agoric-sdk/pull/6903#discussion_r1098067133
 
-import '@agoric/swingset-liveslots/tools/prepare-test-env.js';
+import { test } from './prepare-test-env-ava.js';
 
-import test from 'ava';
+// eslint-disable-next-line import/order
 import { M, makeScalarMapStore } from '@agoric/store';
 import { makeScalarBigMapStore } from '../src/vat-data-bindings.js';
 

diff --git a/packages/vat-data/test/test-virtual-classes.js b/packages/vat-data/test/test-virtual-classes.js
@@ -1,8 +1,8 @@
 // Modeled on test-heap-classes.js
 
-import '@agoric/swingset-liveslots/tools/prepare-test-env.js';
+import { test } from './prepare-test-env-ava.js';
 
-import test from 'ava';
+// eslint-disable-next-line import/order
 import { M } from '@agoric/store';
 import {
   defineVirtualExoClass,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		import '@agoric/swingset-liveslots/tools/prepare-test-env.js';