ui5-test-runner 5.6.2 → 5.7.0

package/index.js

@@ -109,18 +109,32 @@ async function main () {
   await probeBrowser(job)
   await notifyAndExecuteTests(job)
   if (job.watch) {
-    delete job.start
     if (!job.watching) {
+      job.status = 'Watching...'
+      let running = false
+      let rerun = false
+      const run = async () => {
+        running = true
+        do {
+          rerun = false
+          await recreateDir(job.reportDir)
+          await notifyAndExecuteTests(job)
+        } while (rerun)
+        running = false
+        job.status = 'Watching...'
+      }
       output.watching(job.watchFolder)
       watch(job.watchFolder, { recursive: true }, async (eventType, filename) => {
         output.changeDetected(eventType, filename)
-        if (!job.start) {
-          await recreateDir(job.reportDir)
-          notifyAndExecuteTests(job)
+        if (running) {
+          rerun = true
+        } else {
+          run()
         }
       })
       job.watching = true
     }
+    return
   } else if (job.keepAlive) {
     job.status = 'Serving'
     return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui5-test-runner",
-  "version": "5.6.2",
+  "version": "5.7.0",
   "description": "Standalone test runner for UI5",
   "main": "index.js",
   "bin": {
@@ -48,20 +48,20 @@
     "ps-tree": "^1.2.0",
     "punybind": "^1.2.1",
     "punyexpr": "^1.0.4",
-    "reserve": "2.1.0"
+    "reserve": "2.2.0"
   },
   "devDependencies": {
-    "@openui5/types": "^1.134.0",
+    "@openui5/types": "^1.135.0",
     "@ui5/cli": "^4.0.14",
     "@ui5/middleware-code-coverage": "^2.0.1",
-    "dotenv": "^16.4.7",
+    "dotenv": "^16.5.0",
     "jest": "^29.7.0",
-    "nock": "^14.0.1",
+    "nock": "^14.0.3",
     "nyc": "^17.1.0",
     "rimraf": "^6.0.1",
     "standard": "^17.1.2",
-    "typescript": "^5.8.2",
-    "ui5-tooling-transpile": "^3.7.3"
+    "typescript": "^5.8.3",
+    "ui5-tooling-transpile": "^3.7.5"
   },
   "optionalDependencies": {
     "fsevents": "^2.3.3"

package/src/browsers.js

@@ -131,7 +131,7 @@ async function start (job, url, scripts = []) {
   }
   if (resolvedScripts.length) {
     resolvedScripts.unshift(`(function () {
-  window['ui5-test-runner/base-host'] = 'http://${job.callbackHost}:${job.port}'
+  window['ui5-test-runner/base-host'] = 'http://${job.localhost}:${job.port}'
 }())`)
   }
   const progress = newProgress(job, url)

package/src/csv-writer.js

@@ -4,6 +4,9 @@ const { writeFile } = require('fs/promises')
 
 const append = (fileName, line) => writeFile(fileName, line + '\n', { flag: 'a+' })
 const escape = value => {
+  if (value === undefined) {
+    return '❓'
+  }
   const stringValue = value.toString()
   if (stringValue.match(/\r|\n|\t|"/)) {
     return JSON.stringify(stringValue)

package/src/defaults/selenium-webdriver.js

@@ -77,6 +77,7 @@ require('./browser')({
     if (driver && settings.capabilities.traces.includes('console')) {
       const logs = await driver.manage().logs().get(logging.Type.BROWSER)
       const logLevelMapping = {
+        DEBUG: 'debug',
         INFO: 'log',
         WARNING: 'warning',
         SEVERE: 'error'

package/src/job.js

@@ -79,7 +79,7 @@ function getCommand (cwd) {
 
   const DEBUG_OPTION = '(🐞 for debugging purpose)'
   const EXPERIMENTAL_OPTION = '[⚠️ experimental]'
-  const DANGEROURS_OPTION = '[💣 use carefully]'
+  const DANGEROUS_OPTION = '[💣 use carefully]'
 
   command
     .name(name)
@@ -112,7 +112,7 @@ function getCommand (cwd) {
     .option('-oi, --output-interval <interval>', '[💻🔗🧪📡] Interval for reporting progress on non interactive output (CI/CD) (0 means no output)', timeout, 30000)
     .option('--offline [flag]', '[💻🔗🧪📡] Limit network usage (implies --no-npm-install)', boolean, false)
     .option('--env <name=value...>', '[💻🔗🧪📡] Set environment variable', arrayOf(string))
-    .option('--callback-host <host>', `[💻🔗🧪📡] ${DANGEROURS_OPTION} Hostname for callbacks`, string, 'localhost')
+    .option('--localhost <host>', `[💻🔗🧪📡] ${DANGEROUS_OPTION} Hostname for legacy URLs and callbacks`, string, 'localhost')
 
     // Common to legacy and url
     .option('--webapp <path>', '[💻🔗] Base folder of the web application (relative to cwd)', 'webapp')

package/src/tests.js

@@ -132,7 +132,7 @@ async function process (job) {
 module.exports = {
   async execute (job) {
     if (job.mode !== 'url') {
-      job.url = [`http://localhost:${job.port}/${job.testsuite}`]
+      job.url = [`http://${job.localhost}:${job.port}/${job.testsuite}`]
     } else if (!job.browserCapabilities.scripts) {
       throw UTRError.BROWSER_MISS_SCRIPTS_CAPABILITY()
     }