refactor(env-options): migrate test to reduce cyclic dependencies

endojs · Dec 19, 2023 · 75e7dd6 · 75e7dd6
1 parent 94472c4
commit 75e7dd6
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/packages/env-options/README.md b/packages/env-options/README.md
@@ -74,3 +74,8 @@ if (capturedEnvironmentOptionNames.length > 0) {
   );
 }
 ```
+
+# Note of test migration
+
+To reduce cyclic dependencies, the tests of this module have been moved to
+@endo/ses-ava. Doing `yarn test` here currently does nothing.
diff --git a/packages/env-options/package.json b/packages/env-options/package.json
@@ -32,11 +32,9 @@
     "lint:types": "tsc",
     "build:types": "tsc --build tsconfig.build.json",
     "clean:types": "git clean -f '*.d.ts*'",
-    "test": "ava"
+    "test": "exit 0"
   },
   "devDependencies": {
-    "@endo/init": "^1.0.0",
-    "@endo/ses-ava": "^1.0.0",
     "ava": "^5.3.0",
     "babel-eslint": "^10.0.3",
     "eslint": "^8.46.0",

diff --git a/packages/env-options/test/prepare-test-env-ava.js b/packages/env-options/test/prepare-test-env-ava.js
diff --git a/packages/lockdown/package.json b/packages/lockdown/package.json
@@ -12,9 +12,6 @@
     "lint-fix": "eslint --fix '**/*.js'",
     "lint": "eslint '**/*.js'"
   },
-  "devDependencies": {
-    "ava": "^5.1.1"
-  },
   "dependencies": {
     "ses": "^1.0.0"
   },

diff --git a/packages/ses-ava/package.json b/packages/ses-ava/package.json
@@ -38,6 +38,8 @@
     "ses": "^1.0.0"
   },
   "devDependencies": {
+    "@endo/env-options": "^1.0.0",
+    "@endo/lockdown": "^1.0.0",
     "ava": "^5.3.0",
     "babel-eslint": "^10.0.3",
     "c8": "^7.14.0",

diff --git a/packages/ses-ava/test/prepare-test-env-ava.js b/packages/ses-ava/test/prepare-test-env-ava.js
@@ -0,0 +1,7 @@
+import '@endo/lockdown/commit-debug.js';
+
+import rawTest from 'ava';
+import { wrapTest } from '../src/ses-ava-test.js';
+
+/** @type {typeof rawTest} */
+export const test = wrapTest(rawTest);
diff --git a/...ages/env-options/test/test-env-options.js → packages/ses-ava/test/test-env-options.js b/...ages/env-options/test/test-env-options.js → packages/ses-ava/test/test-env-options.js
@@ -1,5 +1,7 @@
 import { test } from './prepare-test-env-ava.js';
-import { makeEnvironmentCaptor } from '../src/env-options.js';
+
+// eslint-disable-next-line import/order
+import { makeEnvironmentCaptor } from '@endo/env-options';
 
 test('test env options empty env', async t => {
   const c1 = new Compartment();