ui5-test-runner 5.7.3 → 5.8.0

package/package.json

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

package/src/batch.js

@@ -2,7 +2,7 @@ const { open, readdir, stat, unlink } = require('fs/promises')
 const { extname, isAbsolute, join } = require('path')
 const { allocPromise, filename } = require('./tools')
 const { fork } = require('child_process')
-const { interactive, getOutput, newProgress } = require('./output')
+const { getOutput, newProgress } = require('./output')
 const { parallelize } = require('./parallelize')
 const { $statusProgressCount } = require('./symbols')
 const { $valueSources } = require('./symbols')
@@ -56,9 +56,7 @@ const task = async function (batchItem) {
   const reportDir = join(job.reportDir, id)
   progress.label = `${label} (${id})`
   progress.count = 1
-  if (!interactive) {
-    output.log(`${label}...`)
-  }
+  output.batchStartingTask(label)
   const { promise, resolve, reject } = allocPromise()
   const parameters = [
     ...args,

package/src/defaults/junit-xml-report.js

@@ -24,9 +24,9 @@ async function main () {
   const job = require(join(reportDir, 'job.js'))
   o('<?xml version="1.0" encoding="UTF-8"?>')
   o('<testsuites>')
-  const urls = Object.keys(job.qunitPages)
+  const urls = Object.keys(job.qunitPages || {})
   for (const url of urls) {
-    const qunitPage = job.qunitPages[url]
+    const qunitPage = job.qunitPages[url] || { modules: [] }
     for (const module of qunitPage.modules) {
       o(`  <testsuite
     name="${xmlEscape(url)}"

package/src/job-mode.js

@@ -40,7 +40,8 @@ function buildAndCheckMode (job) {
       'config',
       'batchMode',
       'batchId',
-      'batchLabel'
+      'batchLabel',
+      'ci'
     ])
     return 'capabilities'
   }

package/src/job.js

@@ -113,6 +113,7 @@ function getCommand (cwd) {
     .option('--offline [flag]', '[💻🔗🧪📡] Limit network usage (implies --no-npm-install)', boolean, false)
     .option('--env <name=value...>', '[💻🔗🧪📡] Set environment variable', arrayOf(string))
     .option('--localhost <host>', `[💻🔗🧪📡] ${DANGEROUS_OPTION} Hostname for legacy URLs and callbacks`, string, 'localhost')
+    .option('--ci [flag]', '[💻🔗🧪📡] CI mode (no interactive output)', boolean, false)
 
     // Common to legacy and url
     .option('--webapp <path>', '[💻🔗] Base folder of the web application (relative to cwd)', 'webapp')

package/src/output.js

@@ -10,8 +10,6 @@ const {
 } = require('./symbols')
 const { filename, noop, pad } = require('./tools')
 
-const inJest = typeof jest !== 'undefined'
-const interactive = process.stdout.columns !== undefined && !inJest
 const $output = Symbol('output')
 const $outputStart = Symbol('output-start')
 const $outputProgress = Symbol('output-progress')
@@ -19,22 +17,9 @@ const $logServerIncomingCount = Symbol('log-server-incoming')
 const $logServerRedirectedCount = Symbol('log-server-redirected')
 const $logServerClosedCount = Symbol('log-server-closed')
 const $logServerRequests = Symbol('log-server-requests')
+const $interactive = Symbol('interactive')
 
-if (!interactive) {
-  const UTF8_BOM_CODE = '\ufeff'
-  process.stdout.write(UTF8_BOM_CODE)
-}
-
-let cons
-if (inJest) {
-  cons = {
-    log: noop,
-    warn: noop,
-    error: noop
-  }
-} else {
-  cons = console
-}
+let cons = console
 
 const formatTime = duration => {
   duration = Math.ceil(duration / 1000)
@@ -129,7 +114,7 @@ function progress (job, cleanFirst = true) {
     })
   }
   const sequence = []
-  if (interactive) {
+  if (job[$interactive]) {
     if (cleanFirst) {
       sequence.push(...buildCleanSequence(job))
     }
@@ -248,8 +233,21 @@ function browserIssue (job, { type, url, code, dir }) {
 }
 
 function build (job) {
+  let interactive = !job.ci
+  const inJest = typeof jest !== 'undefined'
+  if (inJest) {
+    cons = { log: noop, warn: noop, error: noop }
+    interactive = false
+  } else if (process.stdout.columns === undefined || !process.stdout.isTTY) {
+    interactive = false
+  }
+  if (!interactive) {
+    const UTF8_BOM_CODE = '\ufeff'
+    process.stdout.write(UTF8_BOM_CODE)
+  }
   let wrap
   if (interactive) {
+    job[$interactive] = true
     wrap = method => function () {
       clean(job)
       try {
@@ -476,6 +474,12 @@ function build (job) {
       log(job, p80()`⚠️ [SKIPIF] Skipping execution (--if)`)
     }),
 
+    batchStartingTask: wrap((label) => {
+      if (!interactive) {
+        log(job, p80()`${label}...`)
+      }
+    }),
+
     batchFailed: wrap((batch, reason) => {
       log(job, p80()`⚠️ [BATCHF] Failed to resolve batch ${batch}: ${reason}`)
     }),
@@ -662,8 +666,6 @@ function build (job) {
 }
 
 module.exports = {
-  interactive,
-
   getOutput (job) {
     if (!job[$output]) {
       job[$output] = build(job)