ui5-test-runner 2.0.0 → 2.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui5-test-runner",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Standalone test runner for UI5",
   "main": "index.js",
   "files": [
@@ -52,7 +52,7 @@
     "reserve": "^1.15.2"
   },
   "devDependencies": {
-    "jest": "^29.4.3",
+    "jest": "^29.5.0",
     "nock": "^13.3.0",
     "nyc": "^15.1.0",
     "standard": "^17.0.0"
@@ -95,4 +95,4 @@
       }
     }
   }
-}
+}

package/src/defaults/report.js

@@ -3,6 +3,7 @@
 const { join } = require('path')
 const { readFile, writeFile } = require('fs').promises
 const [,, reportDir] = process.argv
+const { resolveDependencyPath } = require('../npm.js')
 
 const defaultDir = join(__dirname, 'report')
 
@@ -11,7 +12,7 @@ async function readDefault (name) {
 }
 
 async function readDependency (name) {
-  return (await readFile(join(__dirname, '../../node_modules', name, 'dist', `${name}.js`))).toString()
+  return (await readFile(resolveDependencyPath(name))).toString()
 }
 
 function minifyJs (src) {

package/src/endpoints.js

@@ -10,6 +10,10 @@ const { addTestPages } = require('./add-test-pages')
 const { getJobProgress } = require('./get-job-progress')
 const { readFile } = require('fs/promises')
 const { TextEncoder } = require('util')
+const { resolveDependencyPath } = require('./npm.js')
+
+const punyexprBinPath = resolveDependencyPath('punyexpr')
+const punybindBinPath = resolveDependencyPath('punybind')
 
 module.exports = job => {
   async function endpointImpl (api, implementation, request) {
@@ -131,11 +135,11 @@ module.exports = job => {
       }, {
       // punybind
         match: '^/_/punybind.js',
-        file: join(__dirname, '../node_modules/punybind/dist/punybind.js')
+        file: punybindBinPath
       }, {
       // punyexpr
         match: '^/_/punyexpr.js',
-        file: join(__dirname, '../node_modules/punyexpr/dist/punyexpr.js')
+        file: punyexprBinPath
       }, {
       // Endpoint to follow progress
         match: '^/_/progress(?:\\?page=([^&]*)(?:&test=([^&]*))?)?',

package/src/job.js

@@ -258,7 +258,10 @@ function finalize (job) {
 function fromCmdLine (cwd, args) {
   let job = parse(cwd, args)
 
-  const defaultPath = join(job.cwd, 'ui5-test-runner.json')
+  let defaultPath = join(job.cwd, 'ui5-test-runner.json')
+  if (!isAbsolute(defaultPath)) {
+    defaultPath = join(job.initialCwd, defaultPath)
+  }
   let hasDefaultSettings = false
   try {
     checkAccess({ path: defaultPath, file: true })

package/src/npm.js

@@ -32,6 +32,11 @@ let localRoot
 let globalRoot
 
 module.exports = {
+  resolveDependencyPath (name) {
+    require(name)
+    return Object.keys(require.cache).filter(path => path.endsWith(`${name}.js`))[0]
+  },
+
   async resolvePackage (job, name) {
     if (!localRoot) {
       [localRoot, globalRoot] = await Promise.all([

package/src/output.js

@@ -345,27 +345,33 @@ function build (job) {
       log(job, p`└──────────${pad.x('─')}┘`)
     }),
 
-    monitor (childProcess) {
+    monitor (childProcess, live = true) {
+      const defaults = {
+        stdout: { buffer: [], method: log },
+        stderr: { buffer: [], method: err }
+      };
       ['stdout', 'stderr'].forEach(channel => {
-        const defaults = {
-          stdout: { buffer: [], method: log },
-          stderr: { buffer: [], method: err }
-        }
         childProcess[channel].on('data', chunk => {
           const { buffer, method } = defaults[channel]
           const text = chunk.toString()
-          if (!text.includes('\n')) {
+          if (live) {
+            if (!text.includes('\n')) {
+              buffer.push(text)
+              return
+            }
+            const cached = buffer.join('')
+            const last = text.split('\n').slice(-1)
+            buffer.length = 0
+            if (last) {
+              buffer.push(last)
+            }
+            wrap(() => method(job, cached + text.split('\n').slice(0, -1).join('\n')))()
+          } else {
             buffer.push(text)
-            return
           }
-          const cached = buffer.join('')
-          const last = text.split('\n').slice(-1)
-          buffer.length = 0
-          if (last) {
-            buffer.push(last)
-          }
-          wrap(() => method(job, cached + text.split('\n').slice(0, -1).join('\n')))()
         })
+      })
+      if (live) {
         childProcess.on('close', () => {
           ['stdout', 'stderr'].forEach(channel => {
             const { buffer, method } = defaults[channel]
@@ -374,7 +380,11 @@ function build (job) {
             }
           })
         })
-      })
+      }
+      return {
+        stdout: defaults.stdout.buffer,
+        stderr: defaults.stderr.buffer
+      }
     },
 
     nyc: wrap((...args) => {
@@ -499,6 +509,19 @@ function build (job) {
       }
     }),
 
+    reportGeneratorFailed: wrap((generator, exitCode, buffers) => {
+      const p = p80()
+      log(job, p`┌──────────${pad.x('─')}┐`)
+      log(job, p`│ REPORT GENERATOR FAILED ${pad.x(' ')} │`)
+      log(job, p`├───────────┬─${pad.x('─')}──┤`)
+      log(job, p`│ generator │ ${pad.lt(generator)} │`)
+      log(job, p`├───────────┼─${pad.x('─')}──┤`)
+      log(job, p`│ exit code │ ${pad.lt(exitCode.toString())} │`)
+      log(job, p`├───────────┴─${pad.x('─')}──┤`)
+      log(job, p`│ ${pad.w(buffers.stderr.join(''))} │`)
+      log(job, p`└──────────${pad.x('─')}┘`)
+    }),
+
     stop () {
       if (this.reportIntervalId) {
         clearInterval(this.reportIntervalId)

package/src/report.js

@@ -8,7 +8,12 @@ const { fork } = require('child_process')
 const { getOutput } = require('./output')
 
 async function serialize (job, filename, json) {
-  await writeFile(join(job.reportDir, `${filename}.js`), `module.exports = ${JSON.stringify(json, undefined, 2)}`)
+  await writeFile(join(job.reportDir, `${filename}.js`), `module.exports = ${JSON.stringify(json, (key, value) => {
+    if (value && value instanceof RegExp) {
+      return value.toString()
+    }
+    return value
+  }, 2)}`)
 }
 
 async function save (job) {
@@ -28,10 +33,14 @@ module.exports = {
     await save(job)
     const promises = job.reportGenerator.map(generator => {
       const { promise, resolve } = allocPromise()
-      const childProcess = fork(generator, [job.reportDir], {
-        stdio: [0, 0, 0, 'ipc']
+      const childProcess = fork(generator, [job.reportDir], { stdio: 'pipe' })
+      const buffers = output.monitor(childProcess, false)
+      childProcess.on('close', exitCode => {
+        if (exitCode !== 0) {
+          output.reportGeneratorFailed(generator, exitCode, buffers)
+        }
+        resolve()
       })
-      childProcess.on('close', resolve)
       return promise
     })
     promises.push(generateCoverageReport(job))

package/src/reserve.js

@@ -10,6 +10,7 @@ module.exports = job => check({
   port: job.port,
   mappings: [
     cors,
+    ...job.mappings ?? [],
     ...job.serveOnly ? [] : endpoints(job),
     ...ui5(job),
     ...job.serveOnly ? [] : coverage(job), {
@@ -19,7 +20,6 @@ module.exports = job => check({
       strict: true,
       'ignore-if-not-found': true
     },
-    ...job.mappings ?? [],
     ...unhandled(job)
   ]
 })

package/src/simulate.spec.js

@@ -120,6 +120,35 @@ describe('simulate', () => {
     }
   }
 
+  describe('mappings', () => {
+    beforeAll(async () => {
+      await setup('mappings', {
+        mappings: [
+          '/overridden/resources/(.*)=file(./LICENSE)'
+        ]
+      })
+    })
+
+    const urls = [
+      '/webapp/resources/sap-ui-core.js',
+      '/resources/sap-ui-core.js',
+      '/custom/resources/sap-ui-core.js'
+    ]
+    urls.forEach(url => {
+      it(`fetches UI5 resources whichever path is used (${url})`, async () => {
+        const response = await get(url, 'test.html')
+        expect(response.statusCode).toStrictEqual(200)
+        expect(response.toString().includes('/sap-ui-core.js */')).toStrictEqual(true)
+      })
+    })
+
+    it('enables overridding through mappings', async () => {
+      const response = await get('/overridden/resources/sap-ui-core.js', 'test.html')
+      expect(response.statusCode).toStrictEqual(200)
+      expect(response.toString().startsWith('MIT License')).toStrictEqual(true)
+    })
+  })
+
   describe('legacy (local project)', () => {
     describe('simple test execution', () => {
       beforeAll(async () => {