chore: normalize test config (#643)

- Upgrades `ava`. - Renames all test file extensions to `.spec.js`. - Relocate all Ava config into the `package.json` of each workspace. - Change some commented-out tests to skipped tests. - Add config to run all tests via e.g. `npm exec ava` from the workspace root
LavaMoat · Aug 21, 2023 · b941c04 · b941c04
1 parent 6ef1593
commit b941c04
Show file tree

Hide file tree

Showing 50 changed files with 232 additions and 332 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "@commitlint/cli": "^17.6.7",
     "@commitlint/config-conventional": "^17.6.7",
     "@metamask/eslint-config-nodejs": "^11.0.1",
-    "ava": "^5.2.0",
+    "ava": "^5.3.1",
     "conventional-changelog-conventionalcommits": "^6.1.0",
     "cross-env": "^7.0.3",
     "depcheck": "^1.4.0",
@@ -52,5 +52,11 @@
       "lerna>nx>@parcel/watcher": false,
       "$root$": true
     }
+  },
+  "ava": {
+    "files": [
+      "packages/*/test/*.spec.js"
+    ],
+    "timeout": "2m"
   }
 }
diff --git a/packages/aa/package.json b/packages/aa/package.json
@@ -11,7 +11,7 @@
   },
   "scripts": {
     "test": "npm run test:run",
-    "test:run": "ava --timeout=30s test/index.js",
+    "test:run": "ava",
     "lint": "npm run lint:eslint && npm run lint:deps",
     "lint:eslint": "eslint .",
     "lint:fix": "eslint . --fix",
@@ -33,5 +33,11 @@
   "author": "kumavis",
   "engines": {
     "node": ">=14.0.0"
+  },
+  "ava": {
+    "files": [
+      "test/*.spec.js"
+    ],
+    "timeout": "30s"
   }
 }
diff --git a/packages/aa/test/index.js → packages/aa/test/index.spec.js b/packages/aa/test/index.js → packages/aa/test/index.spec.js
diff --git a/packages/allow-scripts/package.json b/packages/allow-scripts/package.json
@@ -37,7 +37,7 @@
   },
   "scripts": {
     "test": "npm run test:run",
-    "test:run": "ava --timeout=30s test/index.js",
+    "test:run": "ava",
     "test:prep": "for d in ./test/projects/*/ ; do (cd \"$d\" && ../../../src/cli.js auto --experimental-bins); done",
     "lint": "npm run lint:eslint && npm run lint:deps",
     "lint:eslint": "eslint .",
@@ -48,5 +48,11 @@
   "homepage": "https://github.com/LavaMoat/LavaMoat/tree/main/packages/allow-scripts",
   "engines": {
     "node": ">=14.0.0"
-}
+  },
+  "ava": {
+    "files": [
+      "test/*.spec.js"
+    ],
+    "timeout": "30s"
+  }
 }
diff --git a/packages/allow-scripts/test/index.js → packages/allow-scripts/test/index.spec.js b/packages/allow-scripts/test/index.js → packages/allow-scripts/test/index.spec.js
diff --git a/packages/browserify/ava.config.cjs b/packages/browserify/ava.config.cjs
diff --git a/packages/browserify/package.json b/packages/browserify/package.json
@@ -41,7 +41,7 @@
     "watchify": "^4.0.0"
   },
   "scripts": {
-    "test": "ava --timeout 2m --concurrency 1",
+    "test": "ava",
     "test:prep": "WRITE_AUTO_POLICY=1 ./test/fixtures/secureBundling/run.sh",
     "lint": "npm run lint:eslint && npm run lint:deps",
     "lint:eslint": "eslint .",
@@ -61,5 +61,12 @@
     "allowScripts": {
       "keccak": false
     }
+  },
+  "ava": {
+    "files": [
+      "test/*.spec.js"
+    ],
+    "timeout": "2m",
+    "concurrency": 1
   }
 }
diff --git a/packages/browserify/test/arguments.js → packages/browserify/test/arguments.spec.js b/packages/browserify/test/arguments.js → packages/browserify/test/arguments.spec.js
diff --git a/packages/browserify/test/basic.js → packages/browserify/test/basic.spec.js b/packages/browserify/test/basic.js → packages/browserify/test/basic.spec.js
diff --git a/packages/browserify/test/factor.js → packages/browserify/test/factor.spec.js b/packages/browserify/test/factor.js → packages/browserify/test/factor.spec.js
diff --git a/packages/browserify/test/generatePolicy.js → ...es/browserify/test/generatePolicy.spec.js b/packages/browserify/test/generatePolicy.js → ...es/browserify/test/generatePolicy.spec.js
diff --git a/packages/browserify/test/globalRef.js → packages/browserify/test/globalRef.spec.js b/packages/browserify/test/globalRef.js → packages/browserify/test/globalRef.spec.js
diff --git a/packages/browserify/test/globalWrites.js → ...ages/browserify/test/globalWrites.spec.js b/packages/browserify/test/globalWrites.js → ...ages/browserify/test/globalWrites.spec.js
diff --git a/packages/browserify/test/globals.js → packages/browserify/test/globals.spec.js b/packages/browserify/test/globals.js → packages/browserify/test/globals.spec.js
diff --git a/packages/browserify/test/lavamoatNode.js → ...ages/browserify/test/lavamoatNode.spec.js b/packages/browserify/test/lavamoatNode.js → ...ages/browserify/test/lavamoatNode.spec.js
diff --git a/packages/browserify/test/policy.js → packages/browserify/test/policy.spec.js b/packages/browserify/test/policy.js → packages/browserify/test/policy.spec.js
diff --git a/packages/browserify/test/runScenarios.js → ...ages/browserify/test/runScenarios.spec.js b/packages/browserify/test/runScenarios.js → ...ages/browserify/test/runScenarios.spec.js
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -26,7 +26,7 @@
     "lint:eslint": "eslint .",
     "lint:fix": "eslint --fix .",
     "lint:deps": "depcheck",
-    "test": "ava --timeout=30s test/index.js",
+    "test": "ava",
     "lib:ses": "echo 'disabled SES overwrite in this branch'; exit 1 #cp ../../node_modules/ses/dist/lockdown.umd.js ./lib/lockdown.umd.js"
   },
   "author": "kumavis",
@@ -42,5 +42,11 @@
       "templateRequire": "readonly",
       "lockdown": "readonly"
     }
+  },
+  "ava": {
+    "files": [
+      "test/*.spec.js"
+    ],
+    "timeout": "30s"
   }
 }
diff --git a/packages/core/test/builtin.js → packages/core/test/builtin.spec.js b/packages/core/test/builtin.js → packages/core/test/builtin.spec.js
diff --git a/packages/core/test/circularDeps.js → packages/core/test/circularDeps.spec.js b/packages/core/test/circularDeps.js → packages/core/test/circularDeps.spec.js
diff --git a/packages/core/test/generatePolicy.js → packages/core/test/generatePolicy.spec.js b/packages/core/test/generatePolicy.js → packages/core/test/generatePolicy.spec.js
diff --git a/packages/core/test/globals.js → packages/core/test/globals.spec.js b/packages/core/test/globals.js → packages/core/test/globals.spec.js
diff --git a/packages/core/test/index.js b/packages/core/test/index.js
diff --git a/...s/core/test/makeGetEndowmentsForConfig.js → ...e/test/makeGetEndowmentsForConfig.spec.js b/...s/core/test/makeGetEndowmentsForConfig.js → ...e/test/makeGetEndowmentsForConfig.spec.js
diff --git a/packages/core/test/mergePolicy.js → packages/core/test/mergePolicy.spec.js b/packages/core/test/mergePolicy.js → packages/core/test/mergePolicy.spec.js
diff --git a/packages/core/test/runScenarios.js → packages/core/test/runScenarios.spec.js b/packages/core/test/runScenarios.js → packages/core/test/runScenarios.spec.js
diff --git a/packages/lavapack/package.json b/packages/lavapack/package.json
@@ -33,9 +33,7 @@
     "lint:eslint": "eslint .",
     "lint:fix": "eslint . --fix",
     "lint:deps": "depcheck",
-    "test": "npm run test:ava && npm run test:ecma",
-    "test:ava": "ava --timeout=30s test/index.js",
-    "test:ecma": "node test/runtimeEcma.js",
+    "test": "ava",
     "rebuild": "npm run build",
     "build": "node ./src/build-runtime.js"
   },
@@ -46,5 +44,11 @@
     "url": "https://github.com/LavaMoat/lavamoat/issues"
   },
   "homepage": "https://github.com/LavaMoat/lavamoat#readme",
+  "ava": {
+    "files": [
+      "test/*.spec.js"
+    ],
+    "timeout": "30s"
+  },
   "gitHead": "28a238fc4c3d55650bd2ba9a3603b1f275567286"
 }
diff --git a/packages/lavapack/test/index.js → packages/lavapack/test/index.spec.js b/packages/lavapack/test/index.js → packages/lavapack/test/index.spec.js
@@ -3,7 +3,7 @@ const test = require('ava')
 const { pipe, from, concat } = require('mississippi')
 const { SourceMapConsumer } = require('source-map')
 const convertSourceMap = require('convert-source-map')
-const pack = require('../')
+const pack = require('../src')
 
 
 test('dummy test', (t) => {
@@ -70,7 +70,7 @@ test('sourcemap test', async (t) => {
     const bundleLine = bundleString.split('\n')[bundleStartPos.line - 1]
     console.log(`${sourceFile}:\n${bundleLine}`)
   })
-  
+
   consumer.destroy()
   t.pass('no error thrown')
 })
@@ -89,4 +89,4 @@ function deferred () {
     }
   })
   return result
-}
+}
diff --git a/packages/lavapack/test/runtimeEcma.js b/packages/lavapack/test/runtimeEcma.js