ui5-test-runner 3.3.0 → 3.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui5-test-runner",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "Standalone test runner for UI5",
   "main": "index.js",
   "files": [

package/src/coverage.js

@@ -151,6 +151,7 @@ module.exports = {
         coverageGlobalScopeFunc: false
       })
       const instrument = promisify(instrumenter.instrument.bind(instrumenter))
+      const sources = {}
       return [{
         match: /(.*\.js)(\?.*)?$/,
         custom: async (request, response, url) => {
@@ -161,8 +162,15 @@ module.exports = {
           try {
             await access(sourcePath, constants.R_OK)
           } catch (e) {
-            console.log('download', url)
-            await download(origin + url, sourcePath)
+            try {
+              if (sources[url]) {
+                await sources[url]
+              } else {
+                sources[url] = await download(origin + url, sourcePath)
+              }
+            } catch (statusCode) {
+              return statusCode
+            }
           }
           const source = (await readFile(sourcePath)).toString()
           const instrumentedSource = await instrument(source, sourcePath)

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

@@ -39,6 +39,8 @@ async function main () {
     >`)
         if (test.skip) {
           o('      <skipped></skipped>')
+        } else if (!test.report) {
+          o('      <skipped>(no report found)</skipped>')
         } else if (test.report.failed) {
           test.logs
             .filter(({ result }) => !result)

package/src/defaults/puppeteer.js

@@ -12,10 +12,26 @@ require('./browser')({
       ['-h, --viewport-height <height>', 'Viewport height', 1080],
       ['-l, --language <lang...>', 'Language(s)', ['en-US']],
       ['-u, --unsecure', 'Disable security features', false]
-    ],
-    capabilities: {
+    ] // ,
+    // TODO restore when Node16 is no more supported
+    // capabilities: {
+    //   modules: ['puppeteer'],
+    //   screenshot: '.png',
+    //   scripts: true,
+    //   traces: ['console', 'network']
+    // }
+  },
+
+  // TODO remove when Node16 is no more supported
+  async capabilities () {
+    const version = process.version.match(/^v(\d+\.\d+)/)[1]
+    let screenshot
+    if (!version.startsWith('16')) {
+      screenshot = '.png'
+    }
+    return {
       modules: ['puppeteer'],
-      screenshot: '.png',
+      screenshot,
       scripts: true,
       traces: ['console', 'network']
     }

package/src/job.js

@@ -106,7 +106,7 @@ function getCommand (cwd) {
     .option('-bt, --browser-close-timeout <timeout>', '[💻🔗🧪] Maximum waiting time for browser close', timeout, 2000)
     .option('-br, --browser-retry <count>', '[💻🔗🧪] Browser instantiation retries : if the command fails unexpectedly, it is re-executed (0 means no retry)', 1)
 
-    // Common to legacy and testing
+    // Common to legacy and url
     .option('-pf, --page-filter <regexp>', '[💻🔗] Filter out pages not matching the regexp')
     .option('-pp, --page-params <params>', '[💻🔗] Add parameters to page URL')
     .option('-t, --global-timeout <timeout>', '[💻🔗] Limit the pages execution time, fail the page if it takes longer than the timeout (0 means no timeout)', timeout, 0)
@@ -124,8 +124,9 @@ function getCommand (cwd) {
     .option('-cr, --coverage-reporters <reporter...>', '[💻🔗] List of nyc reporters to use', ['lcov', 'cobertura'])
     .option('-s, --serve-only [flag]', '[💻🔗] Serve only', boolean, false)
 
-    // Specific to legacy
+    // Specific to legacy (and might be used with url if pointing to local project)
     .option('--ui5 <url>', '[💻] UI5 url', url, 'https://ui5.sap.com')
+    .option('--no-ui5', '[💻] Disable UI5 mapping (also disable libs)')
     .option('--libs <lib...>', '[💻] Library mapping (<relative>=<path> or <path>)', arrayOf(lib))
     .option('--mappings <mapping...>', '[💻] Custom mapping (<match>=<file|url>(<config>))', arrayOf(mapping))
     .option('--cache <path>', '[💻] Cache UI5 resources locally in the given folder (empty to disable)')
@@ -135,8 +136,8 @@ function getCommand (cwd) {
 
     // Specific to coverage in url mode (experimental)
     .option('-cp, --coverage-proxy [flag]', `[🔗] ${EXPERIMENTAL_OPTION} use internal proxy to instrument remote files`, boolean, false)
-    .option('-cpi, --coverage-proxy-include <regexp>', `[🔗] ${EXPERIMENTAL_OPTION} urls to instrument for coverage`, regex, regex('webapp/.*'))
-    .option('-cpe, --coverage-proxy-exclude <regexp>', `[🔗] ${EXPERIMENTAL_OPTION} urls to ignore for coverage`, regex, regex('(test-)?resources/.*'))
+    .option('-cpi, --coverage-proxy-include <regexp>', `[🔗] ${EXPERIMENTAL_OPTION} urls to instrument for coverage`, regex, regex('.*'))
+    .option('-cpe, --coverage-proxy-exclude <regexp>', `[🔗] ${EXPERIMENTAL_OPTION} urls to ignore for coverage`, regex, regex('/((test-)?resources|tests?)/.*'))
 
     .addOption(new Option('--debug-probe-only', DEBUG_OPTION, boolean).hideHelp())
     .addOption(new Option('--debug-keep-browser-open', DEBUG_OPTION, boolean).hideHelp())

package/src/tools.js

@@ -6,6 +6,7 @@ const { createHash } = require('crypto')
 const { createWriteStream } = require('fs')
 const http = require('http')
 const https = require('https')
+const { unlink } = require('fs/promises')
 
 const recursive = { recursive: true }
 
@@ -136,7 +137,13 @@ async function download (url, filename) {
   await mkdir(dirname(filename), recursive)
   const output = createWriteStream(filename)
   const { promise, resolve, reject } = allocPromise()
-  const request = protocol.request(options, response => {
+  const request = protocol.request(options, async response => {
+    if (response.statusCode !== 200) {
+      reject(response.statusCode)
+      output.end()
+      await unlink(filename)
+      return
+    }
     response.on('error', reject)
     response.on('end', resolve)
     response.pipe(output)

package/src/ui5.js

@@ -7,7 +7,7 @@ const { capture } = require('reserve')
 const { getOutput } = require('./output')
 
 module.exports = job => {
-  if (job.mode === 'url') {
+  if (job.noUi5) {
     return []
   }
 

package/src/unhandled.js

@@ -23,7 +23,7 @@ module.exports = job => {
         getOutput(job).unhandled()
         outputUnhandled = false
       }
-      writeFile(unhandled, `${extractPageUrl(headers)} ${status} ${method} ${url}\n`, {
+      writeFile(unhandled, `${extractPageUrl(headers) || headers.referer} ${status} ${method} ${url}\n`, {
         flag: 'a'
       }, noop)
       return status