ui5-test-runner 5.8.1 → 5.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui5-test-runner",
-  "version": "5.8.1",
+  "version": "5.9.1",
   "description": "Standalone test runner for UI5",
   "main": "index.js",
   "bin": {

package/src/batch.js

@@ -70,10 +70,10 @@ const task = async function (batchItem) {
       .filter(name => job[$valueSources][name] === 'cli')
       .forEach(name => {
         const longName = toLongName(name)
-        const option = batchParameters[longName]
+        const option = batchParameters[longName] || batchParameters['no-' + longName]
         if (option) {
-          parameters.push(`--${longName}`)
-          if (!option.optional && !option.negate) {
+          parameters.push(option.long)
+          if (!option.negate) {
             if (name === 'env') {
               Object.keys(job.env).forEach(key => {
                 parameters.push(`${key}=${job.env[key]}`)

package/src/browsers.js

@@ -14,6 +14,10 @@ let lastScreenshotId = 0
 const screenshots = {}
 
 async function instantiate (job, config) {
+  if (job.browserArgs.some((arg) => !arg.trim())) {
+    getOutput(job).emptyBrowserArg()
+    job.browserArgs = job.browserArgs.filter((arg) => arg.trim())
+  }
   const { dir, url } = config
   await recreateDir(dir)
   const browserConfig = {

package/src/job.js

@@ -420,8 +420,8 @@ function finalize (job) {
   }
 }
 
-function fromCmdLine (cwd, args) {
-  let job = parse(cwd, args)
+function fromCmdLine (cwd, cmdLineArgs) {
+  let job = parse(cwd, cmdLineArgs)
 
   let defaultPath
   const isConfigSet = job[$valueSources].config === 'cli'
@@ -452,15 +452,18 @@ function fromCmdLine (cwd, args) {
       defaults.cwd = dirname(defaultPath)
     }
     const { before, after, browser } = buildArgs(defaults)
-    const sep = args.indexOf('--')
-    if (sep === -1) {
-      args = [...before, ...args, ...after, '--', ...browser]
-    } else {
-      args = [...before, ...args.slice(0, sep), ...after, '--', ...browser, ...args.slice(sep + 1)]
-    }
+    const sep = cmdLineArgs.indexOf('--')
+    const args = sep === -1
+      ? [...before, ...cmdLineArgs, ...after, '--', ...browser]
+      : [...before, ...cmdLineArgs.slice(0, sep), ...after, '--', ...browser, ...cmdLineArgs.slice(sep + 1)]
     job = parse(cwd, args)
+    job.configContent = defaults
+    job.configArgs = args
+  } else {
+    job.configContent = 'none'
   }
 
+  job.cmdLineArgs = cmdLineArgs
   finalize(job)
   return job
 }

package/src/output.js

@@ -249,12 +249,14 @@ function build (job) {
   if (interactive) {
     job[$interactive] = true
     wrap = method => function () {
+      let result
       clean(job)
       try {
-        method.call(this, ...arguments)
+        result = method.call(this, ...arguments)
       } finally {
         progress(job, false)
       }
+      return result
     }
   } else {
     wrap = method => method
@@ -266,18 +268,18 @@ function build (job) {
     reportIntervalId: undefined,
     lines: 0,
 
-    version: () => {
+    version: wrap(() => {
       const { name, version = 'dev' } = require(join(__dirname, '../package.json'))
       log(job, p80()`${name}@${version}`)
       if (job.debugDevMode) {
         log(job, p80()`⚠️  Development mode ⚠️`)
       }
       return { name, version }
-    },
+    }),
 
-    serving: url => {
+    serving: wrap((url) => {
       log(job, p80()`Server running at ${pad.lt(url)}`)
-    },
+    }),
 
     log: wrap((...texts) => {
       log(job, ...texts)
@@ -423,6 +425,10 @@ function build (job) {
       wrap(() => log(job, `⚠️ [PKGVRS] latest version of ${name} is ${latestVersion}`))()
     },
 
+    emptyBrowserArg () {
+      wrap(() => log(job, '⚠️ [EBWARG] Empty browser argument filtered out'))()
+    },
+
     detectedLeakOfHandles () {
       wrap(() => log(job, '⚠️ [HDLEAK] leaking Node.js handle(s) detected. This may cause issues with the shutdown'))()
     },