ui5-test-runner 5.5.2 → 5.6.0

package/package.json

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

package/src/batch.js

@@ -76,7 +76,11 @@ const task = async function (batchItem) {
         if (option) {
           parameters.push(`--${longName}`)
           if (!option.optional && !option.negate) {
-            if (option.variadic) {
+            if (name === 'env') {
+              Object.keys(job.env).forEach(key => {
+                parameters.push(`${key}=${job.env[key]}`)
+              })
+            } else if (option.variadic) {
               parameters.push(...job[name].map(value => value.toString()))
             } else {
               parameters.push(job[name].toString())

package/src/browsers.js

@@ -29,7 +29,11 @@ async function instantiate (job, config) {
   const stdout = await open(stdoutFilename, 'w')
   const stderr = await open(stderrFilename, 'w')
   const childProcess = fork(job.browser, [browserConfigPath], {
-    stdio: [0, stdout, stderr, 'ipc']
+    stdio: [0, stdout, stderr, 'ipc'],
+    env: {
+      ...process.env,
+      ...job.env
+    }
   })
   const { promise, resolve } = allocPromise()
   childProcess.on('close', async code => {
@@ -127,7 +131,7 @@ async function start (job, url, scripts = []) {
   }
   if (resolvedScripts.length) {
     resolvedScripts.unshift(`(function () {
-  window['ui5-test-runner/base-host'] = 'http://localhost:${job.port}'
+  window['ui5-test-runner/base-host'] = 'http://${job.callbackHost}:${job.port}'
 }())`)
   }
   const progress = newProgress(job, url)

package/src/end.js

@@ -17,7 +17,11 @@ async function end (job) {
     {
       cwd: job.cwd,
       stdio: [0, 'pipe', 'pipe', 'ipc'],
-      windowsHide: true
+      windowsHide: true,
+      env: {
+        ...process.env,
+        ...job.env
+      }
     }
   )
 

package/src/job.js

@@ -79,6 +79,7 @@ function getCommand (cwd) {
 
   const DEBUG_OPTION = '(🐞 for debugging purpose)'
   const EXPERIMENTAL_OPTION = '[⚠️ experimental]'
+  const DANGEROURS_OPTION = '[💣 use carefully]'
 
   command
     .name(name)
@@ -110,6 +111,8 @@ function getCommand (cwd) {
     .option('-br, --browser-retry <count>', '[💻🔗🧪📡] Browser instantiation retries : if the command fails unexpectedly, it is re-executed (0 means no retry)', 1)
     .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')
 
     // Common to legacy and url
     .option('--webapp <path>', '[💻🔗] Base folder of the web application (relative to cwd)', 'webapp')
@@ -299,6 +302,20 @@ function finalize (job) {
     })
   }
 
+  if (!job.env) {
+    job.env = {}
+  } else {
+    job.env = job.env.reduce((dictionary, env) => {
+      const equalPos = env.indexOf('=')
+      if (equalPos === -1) {
+        dictionary[env] = ''
+      } else {
+        dictionary[env.slice(0, equalPos)] = env.slice(equalPos + 1)
+      }
+      return dictionary
+    }, {})
+  }
+
   if (job.watchFolder) {
     job.watch = true
     job.watchFolder = updateToAbsolute(job.watchFolder)

package/src/report.js

@@ -22,7 +22,17 @@ async function save (job) {
 
 function generateTextReport (job) {
   const { promise, resolve } = allocPromise()
-  const childProcess = fork(join(__dirname, 'defaults/text-report.js'), [job.reportDir, process.stdout.columns || ''], { stdio: 'pipe' })
+  const childProcess = fork(
+    join(__dirname, 'defaults/text-report.js'),
+    [job.reportDir, process.stdout.columns || ''],
+    {
+      stdio: 'pipe',
+      env: {
+        ...process.env,
+        ...job.env
+      }
+    }
+  )
   getOutput(job).monitor(childProcess, true)
   childProcess.on('close', resolve)
   return promise
@@ -41,7 +51,17 @@ module.exports = {
     await generateTextReport(job)
     const promises = job.reportGenerator.map(generator => {
       const { promise, resolve } = allocPromise()
-      const childProcess = fork(generator, [job.reportDir], { stdio: 'pipe' })
+      const childProcess = fork(
+        generator,
+        [job.reportDir],
+        {
+          stdio: 'pipe',
+          env: {
+            ...process.env,
+            ...job.env
+          }
+        }
+      )
       const buffers = output.monitor(childProcess, false)
       childProcess.on('close', exitCode => {
         if (exitCode !== 0) {