polendina 3.2.0 → 3.2.2

package/.github/workflows/test-and-release.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v4.0.4
         with:
           node-version: ${{ matrix.node }}
       - name: Install Dependencies
@@ -33,7 +33,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup Node.js
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v4.0.4
         with:
           node-version: lts/*
       - name: Install dependencies

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [3.2.2](https://github.com/rvagg/polendina/compare/v3.2.1...v3.2.2) (2024-09-25)
+
+### Trivial Changes
+
+* **deps:** bump actions/setup-node from 3.5.1 to 4.0.4 ([479fa2a](https://github.com/rvagg/polendina/commit/479fa2a7c5809d19fd5f0e0611307fe228ce2313))
+* update deps ([488fd9c](https://github.com/rvagg/polendina/commit/488fd9caca279a8c07d6a17cde2f5b81d8066d78))
+
+## [3.2.1](https://github.com/rvagg/polendina/compare/v3.2.0...v3.2.1) (2023-05-16)
+
+
+### Bug Fixes
+
+* properly handle subdirectories & relative directory tests ([4ea4a50](https://github.com/rvagg/polendina/commit/4ea4a5011385abdff614f2602e9be6be8cdd1d47))
+
 ## [3.2.0](https://github.com/rvagg/polendina/compare/v3.1.0...v3.2.0) (2023-05-15)
 
 

package/lib/wrap-loader.cjs

@@ -19,13 +19,13 @@ wrapLoader.pitch = function pitch (remainingRequest) {
 
   // wrap the test in a function that is only called when we want it called
   return `
-    import { registry } from ${JSON.stringify(`./${path.relative(process.cwd(), path.resolve(argv.outputDir, 'test-registry.js'))}`)}
+    const { registry } = require('./${path.relative(path.dirname(remainingRequest), path.resolve(argv.outputDir, 'test-registry.cjs')).replace(/\\/g, '/')}')
     registry.argv = JSON.parse(${JSON.stringify(JSON.stringify(argv))})
     registry.tests.push({
-      name: JSON.parse('${JSON.stringify(path.normalize(path.relative(process.cwd(), remainingRequest))).replace(/\\/g, '/')}'),
-      load: () => { return require(${JSON.stringify(`!!${remainingRequest}`)}) }
+      name: JSON.parse('${JSON.stringify(path.normalize(path.relative(process.cwd(), remainingRequest))).replace(/\\+/g, '/')}'),
+      load: () => { return require(${JSON.stringify(`!!./${path.basename(remainingRequest)}`)}) }
     })
-    export default {}
+    module.exports = {}
   `
 }
 

package/package.json

@@ -1,23 +1,23 @@
 {
   "name": "polendina",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "description": "Non-UI browser testing for JavaScript libraries from the command-line",
   "main": "polendina.js",
   "type": "module",
   "dependencies": {
     "ansi-colors": "^4.1.3",
-    "glob": "^10.2.3",
+    "glob": "^11.0.0",
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
-    "puppeteer": "^20.2.0",
+    "puppeteer": "^23.4.0",
     "raw-loader": "^4.0.2",
-    "readable-stream": "^4.4.0",
-    "rimraf": "^5.0.0",
+    "readable-stream": "^4.5.2",
+    "rimraf": "^6.0.1",
     "st": "^3.0.0",
     "stream-browserify": "^3.0.0",
-    "strip-ansi": "^7.0.1",
-    "webpack": "^5.82.1",
-    "webpack-merge": "^5.8.0",
+    "strip-ansi": "^7.1.0",
+    "webpack": "^5.94.0",
+    "webpack-merge": "^6.0.1",
     "yargs": "^17.7.2"
   },
   "bin": {
@@ -25,7 +25,7 @@
     "polendina-node": "./polendina-node-cli.js"
   },
   "scripts": {
-    "lint": "npm_config_yes=true npx standard",
+    "lint": "standard",
     "test:install": "for f in $(cd test/fixtures/; ls); do (cd test/fixtures/$f && grep devDependencies package.json > /dev/null && npm i --no-audit --no-fund --no-package-lock) || true; done",
     "test:run": "npm_config_yes=true npx mocha test/test-*.js",
     "test": "npm run lint && npm run test:install && npm run test:run"
@@ -126,5 +126,8 @@
       "@semantic-release/github",
       "@semantic-release/git"
     ]
+  },
+  "devDependencies": {
+    "standard": "^17.1.2"
   }
 }

package/polendina.js

@@ -63,7 +63,7 @@ export class Polendina {
     }
 
     await fs.promises.mkdir(this.outputDir, { recursive: true })
-    const copyFiles = ['index.html', 'test-registry.js', 'page-run.js', 'common-run.js', this._runnerModule]
+    const copyFiles = ['index.html', 'test-registry.cjs', 'page-run.js', 'common-run.js', this._runnerModule]
     if (this._options.runner.startsWith('bare-')) {
       copyFiles.push('bare.js')
     }

package/resources/common-run.js

@@ -1,6 +1,6 @@
 /* globals WorkerGlobalScope ServiceWorkerGlobalScope clients */
 
-import { registry } from './test-registry.js'
+import { registry } from './test-registry.cjs'
 
 const inPage =
   typeof window !== 'undefined' &&

package/resources/mocha-run.js

@@ -3,7 +3,7 @@
 import mochaExport from 'mocha/mocha.js'
 import { registry, executionQueue, log, setup } from './common-run.js'
 
-function runMocha () {
+async function runMocha () {
   // mocha@8 exports what we want, mocha@7 sets a global
   const mochaLocal = mochaExport
   mochaLocal.setup({ reporter: registry.argv.mochaReporter, ui: 'bdd' })
@@ -18,7 +18,7 @@ function runMocha () {
   mochaLocal.constructor.reporters.Base.consoleLog = log.info
 
   for (const mod of registry.tests) {
-    mod.load()
+    await mod.load()
   }
 
   let errors = 0

package/resources/tape-run.js

@@ -4,7 +4,7 @@ import tape from 'tape'
 import { registry, setup, executionQueue } from './common-run.js'
 import { Transform } from 'stream'
 
-function runTape () {
+async function runTape () {
   let failures = 0
 
   const stream = new Transform({
@@ -32,7 +32,7 @@ function runTape () {
   })
 
   for (const mod of registry.tests) {
-    mod.load()
+    await mod.load()
   }
 }
 

package/resources/test-registry.cjs

@@ -0,0 +1,6 @@
+// see wrap-loader.cjs
+
+module.exports.registry = {
+  argv: null,
+  tests: []
+}

package/test/common.js

@@ -7,7 +7,7 @@ const __dirname = fileURLToPath(path.dirname(import.meta.url))
 const cli = path.join(__dirname, '../polendina-cli.js')
 
 export async function runCli (cwd, args) {
-  return runCommand(`${cli} test*.js --cleanup ${args || ''}`, cwd)
+  return runCommand(`${cli} test*.js test/test*.js --cleanup ${args || ''}`, cwd)
 }
 
 export async function runCommand (command, cwd) {

package/test/fixtures/bare-async/test/test-3.js

@@ -0,0 +1,11 @@
+const { assert } = require('chai')
+const index = require('../')
+
+module.exports.test1 = async function () {
+  console.log('testing bare fixture subdir')
+  assert.strictEqual(await index(), 'bare test fixture')
+}
+
+module.exports.test2 = async function () {
+  assert.ok(true, 'yep')
+}

package/test/fixtures/bare-async-esm/test/test-3.js

@@ -0,0 +1,11 @@
+import { assert } from 'chai'
+import index from '../index.js'
+
+export async function test1 () {
+  console.log('testing bare fixture subdir')
+  assert.strictEqual(await index(), 'bare test fixture')
+}
+
+export async function test2 () {
+  assert.ok(true, 'yep')
+}

package/test/fixtures/bare-sync/test/test-3.js

@@ -0,0 +1,6 @@
+const { assert } = require('chai')
+const index = require('../')
+
+console.log('testing bare fixture subdir')
+assert.strictEqual(index, 'bare test fixture')
+assert.ok(true, 'yep')

package/test/fixtures/bare-sync/test-2.js

@@ -1,4 +1,3 @@
-
 const { assert } = require('chai')
 const index = require('./')
 

package/test/fixtures/bare-sync-esm/test/test-3.js

@@ -0,0 +1,6 @@
+import { assert } from 'chai'
+import index from '../index.js'
+
+console.log('testing bare fixture subdir')
+assert.strictEqual(index, 'bare test fixture')
+assert.ok(true, 'yep')

package/test/fixtures/bare-sync-esm/test-2.js

@@ -1,4 +1,3 @@
-
 import { assert } from 'chai'
 import index from './index.js'
 

package/test/test-bare-async.js

@@ -20,6 +20,10 @@ testing is WORKER
 testing bare fixture
     ✔ test1
     ✔ test2
+  test/test-3.js
+testing bare fixture subdir
+    ✔ test1
+    ✔ test2
 `
 
     it('should run in page', async () => {

package/test/test-bare-sync.js

@@ -18,6 +18,8 @@ testing is WORKER
   ✔ test-1.js
 testing bare fixture
   ✔ test-2.js
+testing bare fixture subdir
+  ✔ test/test-3.js
 `
 
     it('should run in page', async () => {

package/resources/test-registry.js

@@ -1,6 +0,0 @@
-// see wrap-loader.js
-
-export const registry = {
-  argv: null,
-  tests: []
-}