ui5-test-runner 3.2.0 → 3.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui5-test-runner",
-  "version": "3.2.0",
+  "version": "3.3.1",
   "description": "Standalone test runner for UI5",
   "main": "index.js",
   "files": [
@@ -17,6 +17,7 @@
   "scripts": {
     "lint": "standard --fix",
     "test": "npm run test:unit && npm run test:integration:jsdom && npm run test:integration:puppeteer && npm run test:integration:selenium-webdriver-chrome && npm run test:integration:playwright",
+    "test:coverall": "rimraf .nyc_output && jest --coverageDirectory .nyc_output --coverageReporters json && nyc --silent --no-clean npm run test:integration:jsdom && nyc --silent --no-clean npm run test:integration:puppeteer && nyc --silent --no-clean npm run test:integration:selenium-webdriver-chrome && nyc --silent --no-clean npm run test:integration:playwright && nyc merge .nyc_output .nyc_output/final/coverage.json && nyc report --temp-dir .nyc_output/final/ --report-dir coverage --branches 80 --functions 80 --lines 80 --statements 80",
     "test:unit": "jest",
     "test:unit:debug": "jest --runInBand",
     "test:integration:puppeteer": "node . --capabilities --browser $/puppeteer.js",
@@ -24,6 +25,7 @@
     "test:integration:jsdom": "node . --capabilities --browser $/jsdom.js",
     "test:integration:playwright": "node . --capabilities --browser $/playwright.js",
     "test:report": "node ./src/defaults/report.js ./test/report && reserve --config ./test/report/reserve.json",
+    "test:text-report": "node ./src/defaults/text-report.js ./test/report",
     "build:doc": "node build/doc"
   },
   "repository": {
@@ -46,20 +48,20 @@
   },
   "homepage": "https://github.com/ArnaudBuchholz/ui5-test-runner#readme",
   "dependencies": {
-    "commander": "^10.0.1",
+    "commander": "^11.0.0",
     "mime": "^3.0.0",
     "punybind": "^1.2.1",
     "punyexpr": "^1.0.4",
-    "reserve": "^1.15.2"
+    "reserve": "^1.15.3"
   },
   "devDependencies": {
-    "jest": "^29.5.0",
-    "nock": "^13.3.1",
+    "jest": "^29.7.0",
+    "nock": "^13.3.3",
     "nyc": "^15.1.0",
     "standard": "^17.1.0"
   },
   "optionalDependencies": {
-    "fsevents": "^2.3.2"
+    "fsevents": "^2.3.3"
   },
   "standard": {
     "env": [

package/src/coverage.js

@@ -1,18 +1,28 @@
 'use strict'
 
-const { join } = require('path')
+const { join, dirname } = require('path')
 const { fork } = require('child_process')
-const { cleanDir, createDir, filename } = require('./tools')
-const { readdir, readFile, stat, writeFile } = require('fs').promises
+const { cleanDir, createDir, filename, download } = require('./tools')
+const { readdir, readFile, stat, writeFile, access, constants } = require('fs').promises
 const { Readable } = require('stream')
 const { getOutput } = require('./output')
 const { resolvePackage } = require('./npm')
+const { promisify } = require('util')
 
 const $nycSettingsPath = Symbol('nycSettingsPath')
 const $coverageFileIndex = Symbol('coverageFileIndex')
+const $coverageRemote = Symbol('coverageRemote')
 
+let nycInstallationPath
 let nycScript
 
+async function setupNyc (job) {
+  if (!nycInstallationPath) {
+    nycInstallationPath = resolvePackage(job, 'nyc')
+  }
+  nycScript = join(await nycInstallationPath, 'bin/nyc.js')
+}
+
 async function nyc (job, ...args) {
   const output = getOutput(job)
   output.nyc(...args)
@@ -43,10 +53,7 @@ const customFileSystem = {
 }
 
 async function instrument (job) {
-  if (!nycScript) {
-    const nyc = await resolvePackage(job, 'nyc')
-    nycScript = join(nyc, 'bin/nyc.js')
-  }
+  await setupNyc(job)
   job[$nycSettingsPath] = join(job.coverageTempDir, 'settings/nyc.json')
   await cleanDir(job.coverageTempDir)
   await createDir(join(job.coverageTempDir, 'settings'))
@@ -71,6 +78,7 @@ async function instrument (job) {
     })
     if (!useLocal) {
       getOutput(job).instrumentationSkipped()
+      job[$coverageRemote] = true
       return
     }
   }
@@ -81,9 +89,28 @@ async function instrument (job) {
 async function generateCoverageReport (job) {
   job.status = 'Generating coverage report'
   await cleanDir(job.coverageReportDir)
-  await nyc(job, 'merge', job.coverageTempDir, join(job.coverageTempDir, 'coverage.json'))
+  const coverageMergedDir = join(job.coverageTempDir, 'merged')
+  await createDir(coverageMergedDir)
+  const coverageFilename = join(coverageMergedDir, 'coverage.json')
+  await nyc(job, 'merge', job.coverageTempDir, coverageFilename)
+  if (job[$coverageRemote] && !job.coverageProxy) {
+    job.status = 'Collecting remote source files'
+    // Assuming all files are coming from the same server
+    const { origin } = new URL(job.testPageUrls[0])
+    const sourcesBasePath = join(job.coverageTempDir, 'sources')
+    const coverageData = require(coverageFilename)
+    const filenames = Object.keys(coverageData)
+    for (const filename of filenames) {
+      const fileData = coverageData[filename]
+      const { path } = fileData
+      const filePath = join(sourcesBasePath, path)
+      fileData.path = filePath
+      await download(origin + path, filePath)
+    }
+    await writeFile(coverageFilename, JSON.stringify(coverageData))
+  }
   const reporters = job.coverageReporters.map(reporter => `--reporter=${reporter}`)
-  await nyc(job, 'report', ...reporters, '--temp-dir', job.coverageTempDir, '--report-dir', job.coverageReportDir, '--nycrc-path', job[$nycSettingsPath])
+  await nyc(job, 'report', ...reporters, '--temp-dir', coverageMergedDir, '--report-dir', job.coverageReportDir, '--nycrc-path', job[$nycSettingsPath])
 }
 
 module.exports = {
@@ -97,12 +124,67 @@ module.exports = {
     await writeFile(coverageFileName, JSON.stringify(coverageData))
   },
   generateCoverageReport: job => job.coverage && generateCoverageReport(job),
-  mappings: job => job.coverage
-    ? [{
-        match: /^\/(.*\.js)$/,
-        file: join(job.coverageTempDir, 'instrumented', '$1'),
-        'ignore-if-not-found': true,
+  mappings: async job => {
+    if (!job.coverage) {
+      return []
+    }
+    const instrumentedBasePath = join(job.coverageTempDir, 'instrumented')
+    const instrumentedMapping = {
+      match: /^\/(.*\.js)$/,
+      file: join(instrumentedBasePath, '$1'),
+      'ignore-if-not-found': true
+    }
+    if (job.mode === 'legacy') {
+      return [{
+        ...instrumentedMapping,
         'custom-file-system': job.debugCoverageNoCustomFs ? undefined : customFileSystem
       }]
-    : []
+    }
+    if (job.mode === 'url' && job.coverageProxy) {
+      await setupNyc(job)
+      const { origin } = new URL(job.url[0])
+      const sourcesBasePath = join(job.coverageTempDir, 'sources')
+      const { createInstrumenter } = require(join(await nycInstallationPath, 'node_modules/istanbul-lib-instrument'))
+      const instrumenter = createInstrumenter({
+        produceSourceMap: true,
+        coverageGlobalScope: 'window.top',
+        coverageGlobalScopeFunc: false
+      })
+      const instrument = promisify(instrumenter.instrument.bind(instrumenter))
+      const sources = {}
+      return [{
+        match: /(.*\.js)(\?.*)?$/,
+        custom: async (request, response, url) => {
+          if (!url.match(job.coverageProxyInclude) || url.match(job.coverageProxyExclude)) {
+            return // Ignore
+          }
+          const sourcePath = join(sourcesBasePath, url)
+          try {
+            await access(sourcePath, constants.R_OK)
+          } catch (e) {
+            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)
+          const instrumentedSourcePath = join(instrumentedBasePath, url)
+          await createDir(dirname(instrumentedSourcePath))
+          await writeFile(instrumentedSourcePath, instrumentedSource)
+        }
+      },
+      instrumentedMapping,
+      {
+        match: /(.*)$/,
+        url: `${origin}$1`
+      }]
+    }
+    return []
+  }
 }

package/src/coverage.spec.js

@@ -40,7 +40,7 @@ describe('src/coverage', () => {
     })
 
     it('does not create a mapping', async () => {
-      const coverageMappings = mappings(job)
+      const coverageMappings = await mappings(job)
       expect(coverageMappings.length).toStrictEqual(0)
     })
   })
@@ -73,7 +73,7 @@ describe('src/coverage', () => {
     })
 
     it('creates a mapping', async () => {
-      const coverageMappings = mappings(job)
+      const coverageMappings = await mappings(job)
       expect(coverageMappings.length).toStrictEqual(1)
     })
 

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/playwright.js

@@ -2,6 +2,7 @@
 
 const { InvalidArgumentError } = require('commander')
 const { join } = require('path')
+const { exec } = require('child_process')
 
 let browser
 let context
@@ -29,13 +30,33 @@ require('./browser')({
       ['-u, --unsecure', 'Disable security features', false],
       ['-v, --video', 'Record video', false],
       ['-n, --har', 'Record network activity with har file', false]
-    ],
-    capabilities: {
+    ]
+  },
+
+  async capabilities ({ settings, options }) {
+    const capabilities = {
       modules: ['playwright'],
       screenshot: '.png',
       scripts: true,
       traces: ['console', 'network']
     }
+    if (!settings.modules) {
+      return {
+        ...capabilities,
+        'probe-with-modules': true
+      }
+    }
+    return await new Promise((resolve, reject) => {
+      exec('npx playwright install', (err, stdout, stderr) => {
+        console.log(stdout)
+        console.error(stderr)
+        if (err) {
+          reject(new Error('Unable to finalize playwright installation'))
+        } else {
+          resolve(capabilities)
+        }
+      })
+    })
   },
 
   async screenshot ({ filename }) {

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/defaults/report/default.html

@@ -15,6 +15,7 @@
       <table style="visibility: {{ testPageUrls.length > 0 ? 'visible' : 'hidden' }};">
         <tr>
           <th>&nbsp;</th>
+          <th class="count">Type</th>
           <th class="status" style="width: 10rem;"><div><span>Status</span></div></th>
           <th class="count">Tests</th>
           <th class="count">Passed</th>
@@ -26,6 +27,11 @@
               <span {{if}}="qunitPages === undefined || !qunitPages[url]">{{ url }}</span>
               <a {{else}} href="#{{ qunitPages[url].id }}">{{ url }}</a>
           </td>
+          <td>
+            <span {{if}}="!qunitPages[url]">-</span>
+            <span {{elseif}}="qunitPages[url].isOpa" title="OPA test">&#129404;</span>
+            <span {{else}} title="Unit test">&#129514;</span>
+          </td>
           <td>
             <span {{if}}="!qunitPages[url]">-</span>
             <span {{elseif}}="qunitPages[url].failed">&#10060;</span>

package/src/defaults/text-report.js

@@ -0,0 +1,93 @@
+'use strict'
+
+const { join, isAbsolute } = require('path')
+const [, , reportDir] = process.argv
+const { pad } = require('../tools')
+
+const p = pad(process.stdout.columns || 80)
+const log = console.log.bind(console)
+
+function collectErrors (page) {
+  const errors = []
+  page.modules.forEach(module => {
+    module.tests.forEach(test => {
+      if (test.report.failed) {
+        errors.push({ module: module.name, ...test })
+      }
+    })
+  })
+  return errors
+}
+
+async function main () {
+  let jobPath
+  if (isAbsolute(reportDir)) {
+    jobPath = join(reportDir, 'job.js')
+  } else {
+    jobPath = join(process.cwd(), reportDir, 'job.js')
+  }
+  const job = require(jobPath)
+  const failedUrls = []
+  log(p`┌─${pad.x('─')}───────────────────┐`)
+  function render (url) {
+    const page = job.qunitPages && job.qunitPages[url]
+    if (!page || !page.report) {
+      log(p`│${pad.lt(url)} 🧨           │`)
+      failedUrls.push(url)
+    } else {
+      const type = page.isOpa ? '🥼' : '🧪'
+      const status = page.report.failed > 0 ? '🐞' : '  '
+      if (page.report.failed > 0) {
+        failedUrls.push(url)
+      }
+      log(p`│${pad.lt(url)} ${type} ${status} ${page.passed.toString().padStart(3, ' ')}/${page.count.toString().padEnd(3, ' ')}│`)
+    }
+  }
+  job.testPageUrls.forEach(render)
+  Object.keys(job.qunitPages || []).forEach(url => {
+    if (!job.testPageUrls.includes(url)) {
+      render(url)
+    }
+  })
+  log(p`└─${pad.x('─')}────────────────────┘`)
+  failedUrls.forEach(url => {
+    log()
+    log(p`[${pad.lt(url)}]`)
+    const page = job.qunitPages && job.qunitPages[url]
+    if (!page) {
+      log(p`Unable to run the page (check the execution log)`)
+    } else {
+      const pageIndex = job.testPageUrls.indexOf(url)
+      const pageHash = job.testPageHashes[pageIndex]
+      if (pageHash) {
+        log(p`Page execution folder name : ${pageHash}`)
+      }
+      let errors = collectErrors(page)
+      const { length } = errors
+      if (page.isOpa) {
+        // Focus on the first error only
+        errors = errors.slice(0, 1)
+      }
+      errors.forEach((test, index) => {
+        if (index > 0) {
+          log()
+        }
+        log(`${test.module} ▶ ${test.name}`)
+        test.logs.filter(({ result }) => !result).forEach(({ message }) => log(message))
+      })
+      if (page.isOpa && length > 1) {
+        log()
+        log(p`(${length} errors occurred but it is recommended to focus on the first OPA error)`)
+      }
+    }
+  })
+}
+
+main()
+  .catch(reason => {
+    console.error(reason)
+    return -1
+  })
+  .then((code = 0) => {
+    process.exit(code)
+  })

package/src/inject/ui5-coverage.js

@@ -0,0 +1,27 @@
+(function () {
+  'use strict'
+
+  // inspired from ui5/resources/sap/ui/qunit/qunit-coverage-istanbul-dbg.js
+
+  function appendUrlParameter (url) {
+    const urlObject = new URL(url, document.baseURI)
+    urlObject.searchParams.set('instrument', 'true')
+    return urlObject.toString()
+  }
+
+  const nativeSetAttribute = HTMLScriptElement.prototype.setAttribute
+  HTMLScriptElement.prototype.setAttribute = function (name, value) {
+    if (name === 'data-sap-ui-module') {
+      this.src = appendUrlParameter(this.src)
+    }
+    nativeSetAttribute.apply(this, arguments)
+  }
+
+  const nativeXhrOpen = XMLHttpRequest.prototype.open
+  XMLHttpRequest.prototype.open = function (method, url) {
+    if (window.sap && window.sap.ui && window.sap.ui.loader && url && url.endsWith('.js')) {
+      arguments[1] = appendUrlParameter(url)
+    }
+    nativeXhrOpen.apply(this, arguments)
+  }
+}())

package/src/job-mode.js

@@ -34,9 +34,22 @@ function buildAndCheckMode (job) {
     return 'capabilities'
   }
   if (job.url && job.url.length) {
-    check(job, undefined, ['testsuite'])
+    check(job, undefined, [
+      'ui5',
+      'libs',
+      'mappings',
+      'cache',
+      'webapp',
+      'watch',
+      'testsuite'
+    ])
     return 'url'
   }
+  check(job, undefined, [
+    'coverageProxy',
+    'coverageProxyInclude',
+    'coverageProxyExclude'
+  ])
   return 'legacy'
 }
 

package/src/job.js

@@ -7,7 +7,7 @@ const { name, description, version } = require(join(__dirname, '../package.json'
 const { getOutput } = require('./output')
 const { $valueSources } = require('./symbols')
 const { buildAndCheckMode } = require('./job-mode')
-const { boolean, integer, timeout, url, arrayOf } = require('./options')
+const { boolean, integer, timeout, url, arrayOf, regex } = require('./options')
 
 const $status = Symbol('status')
 
@@ -76,7 +76,8 @@ function getCommand (cwd) {
   const command = new Command()
   command.exitOverride()
 
-  const DEBUG_OPTION = '(For debugging purpose)'
+  const DEBUG_OPTION = '(🐞 for debugging purpose)'
+  const EXPERIMENTAL_OPTION = '[⚠️ experimental]'
 
   command
     .name(name)
@@ -105,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)
@@ -115,21 +116,28 @@ function getCommand (cwd) {
     .option('-rg, --report-generator <path...>', '[💻🔗] Report generator paths (relative to cwd or use $/ for provided ones)', ['$/report.js'])
     .option('-pp, --progress-page <path>', '[💻🔗] progress page path (relative to cwd or use $/ for provided ones)', '$/report/default.html')
 
-    // Specific to legacy
+    .option('--coverage [flag]', '[💻🔗] Enable or disable code coverage', boolean)
+    .option('--no-coverage', '[💻🔗] Disable code coverage')
+    .option('-cs, --coverage-settings <path>', '[💻🔗] Path to a custom nyc.json file providing settings for instrumentation (relative to cwd or use $/ for provided ones)', '$/nyc.json')
+    .option('-ct, --coverage-temp-dir <path>', '[💻🔗] Directory to output raw coverage information to (relative to cwd)', '.nyc_output')
+    .option('-cr, --coverage-report-dir <path>', '[💻🔗] Directory to store the coverage report files (relative to cwd)', 'coverage')
+    .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 (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)')
     .option('--webapp <path>', '[💻] Base folder of the web application (relative to cwd)', 'webapp')
     .option('--testsuite <path>', '[💻] Path of the testsuite file (relative to webapp)', 'test/testsuite.qunit.html')
-    .option('-s, --serve-only [flag]', '[💻] Serve only', boolean, false)
     .option('-w, --watch [flag]', '[💻] Monitor the webapp folder and re-execute tests on change', boolean, false)
-    .option('--coverage [flag]', '[💻] Enable or disable code coverage', boolean)
-    .option('--no-coverage', '[💻] Disable code coverage')
-    .option('-cs, --coverage-settings <path>', '[💻] Path to a custom nyc.json file providing settings for instrumentation (relative to cwd or use $/ for provided ones)', '$/nyc.json')
-    .option('-ct, --coverage-temp-dir <path>', '[💻] Directory to output raw coverage information to (relative to cwd)', '.nyc_output')
-    .option('-cr, --coverage-report-dir <path>', '[💻] Directory to store the coverage report files (relative to cwd)', 'coverage')
-    .option('-cr, --coverage-reporters <reporter...>', '[💻] List of nyc reporters to use', ['lcov', 'cobertura'])
+
+    // 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('.*'))
+    .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/job.spec.js

@@ -72,9 +72,8 @@ describe('job', () => {
         expect(job.screenshot).toStrictEqual(false)
       })
 
-      it('url disables webapp checking and coverage', () => {
+      it('url disables coverage by default', () => {
         const job = buildJob({
-          webapp: 'not_a_folder',
           url: 'http://localhost:8080'
         })
         expect(job.url).toStrictEqual(['http://localhost:8080'])
@@ -83,7 +82,6 @@ describe('job', () => {
 
       it('url still allows coverage', () => {
         const job = buildJob({
-          webapp: 'not_a_folder',
           url: 'http://localhost:8080',
           coverage: true
         })
@@ -255,6 +253,13 @@ describe('job', () => {
         })).toThrow()
       })
     })
+
+    it('url forbids the use of webapp', () => {
+      expect(() => buildJob({
+        webapp: 'not_a_folder',
+        url: 'http://localhost:8080'
+      })).toThrow(UTRError.MODE_INCOMPATIBLE_OPTION('webapp'))
+    })
   })
 
   describe('Using ui5-test-runner.json', () => {

package/src/options.js

@@ -31,6 +31,14 @@ module.exports = {
     throw new InvalidArgumentError('Invalid boolean')
   },
 
+  regex (value) {
+    try {
+      return new RegExp(value)
+    } catch (e) {
+      throw new InvalidArgumentError('Invalid regex')
+    }
+  },
+
   integer,
 
   timeout (value) {

package/src/output.js

@@ -488,44 +488,6 @@ function build (job) {
       warn(job, p80()`Some requests are not handled properly, check the unhandled.txt report for more info`)
     }),
 
-    results: wrap(() => {
-      const p = p80()
-      log(job, p`┌──────────${pad.x('─')}┐`)
-      log(job, p`│ RESULTS ${pad.x(' ')} │`)
-      log(job, p`├─────┬─${pad.x('─')}──┤`)
-      const messages = []
-      function result (url) {
-        const page = job.qunitPages && job.qunitPages[url]
-        let message
-        if (!page || !page.report) {
-          message = 'Unable to run the page'
-        } else if (page.report.failed > 1) {
-          message = `${page.report.failed} tests failed`
-        } else if (page.report.failed === 1) {
-          message = '1 test failed'
-        }
-        if (message) {
-          log(job, p`│ ${(messages.length + 1).toString().padStart(3, ' ')} │ ${pad.lt(url)} │`)
-          messages.push(message)
-        } else {
-          log(job, p`│ OK  │ ${pad.lt(url)} │`)
-        }
-      }
-      job.testPageUrls.forEach(result)
-      Object.keys(job.qunitPages || []).forEach(url => {
-        if (!job.testPageUrls.includes(url)) {
-          result(url)
-        }
-      })
-      log(job, p`└─────┴───${pad.x('─')}┘`)
-      messages.forEach((message, index) => {
-        log(job, p`${(index + 1).toString().padStart(3, ' ')}: ${message}`)
-      })
-      if (!messages.length) {
-        log(job, p`Success !`)
-      }
-    }),
-
     reportGeneratorFailed: wrap((generator, exitCode, buffers) => {
       const p = p80()
       log(job, p`┌──────────${pad.x('─')}┐`)

package/src/report.js

@@ -20,6 +20,14 @@ async function save (job) {
   await serialize(job, 'job', job)
 }
 
+function generateTextReport (job) {
+  const { promise, resolve } = allocPromise()
+  const childProcess = fork(join(__dirname, 'defaults/text-report.js'), [job.reportDir], { stdio: 'pipe' })
+  getOutput(job).monitor(childProcess, true)
+  childProcess.on('close', resolve)
+  return promise
+}
+
 module.exports = {
   save,
 
@@ -28,9 +36,9 @@ module.exports = {
     job.end = new Date()
     job.failed = !!job.failed
     job.status = 'Generating reports'
-    output.results()
     job.testPageHashes = job.testPageUrls.map(url => filename(url))
     await save(job)
+    await generateTextReport(job)
     const promises = job.reportGenerator.map(generator => {
       const { promise, resolve } = allocPromise()
       const childProcess = fork(generator, [job.reportDir], { stdio: 'pipe' })

package/src/reserve.js

@@ -6,14 +6,14 @@ const ui5 = require('./ui5')
 const { check } = require('reserve')
 const unhandled = require('./unhandled')
 
-module.exports = job => check({
+module.exports = async job => check({
   port: job.port,
   mappings: [
     cors,
     ...job.mappings ?? [],
     ...job.serveOnly ? [] : endpoints(job),
     ...ui5(job),
-    ...coverage(job), {
+    ...await coverage(job), {
       // Project mapping
       match: /^\/(.*)/,
       file: join(job.webapp, '$1'),

package/src/tests.js

@@ -73,11 +73,24 @@ async function runTestPage (job, url) {
       scripts = [
         'post.js',
         'qunit-intercept.js',
-        'qunit-hooks.js',
-        'opa-iframe-coverage.js'
+        'qunit-hooks.js'
       ]
+      if (job.coverage && !job.coverageProxy) {
+        scripts.push(
+          'opa-iframe-coverage.js',
+          'ui5-coverage.js' // TODO detect if middleware exists before injecting this
+        )
+      }
+    }
+    if (job.coverageProxy) {
+      const { origin } = new URL(url)
+      const proxifiedUrl = url.replace(origin, `http://localhost:${job.port}`)
+      await start(job, proxifiedUrl, scripts)
+      job.qunitPages[url] = job.qunitPages[proxifiedUrl]
+      delete job.qunitPages[proxifiedUrl]
+    } else {
+      await start(job, url, scripts)
     }
-    await start(job, url, scripts)
   } catch (error) {
     output.startFailed(url, error)
     throw error

package/src/tools.js

@@ -1,7 +1,12 @@
 'use strict'
 
+const { dirname } = require('path')
 const { mkdir, rm, stat } = require('fs').promises
 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 }
 
@@ -110,6 +115,44 @@ pad.x = (text) => ({ [$op]: $x, text })
 pad.lt = (text, padding = ' ') => ({ [$op]: $lt, text, padding })
 pad.w = (text) => ({ [$op]: $w, text })
 
+function allocPromise () {
+  let resolve
+  let reject
+  const promise = new Promise((_resolve, _reject) => {
+    resolve = _resolve
+    reject = _reject
+  })
+  return { promise, resolve, reject }
+}
+
+async function download (url, filename) {
+  const { hostname, port, origin } = new URL(url)
+  const options = {
+    hostname,
+    port,
+    path: url.substring(origin.length),
+    method: 'GET'
+  }
+  const protocol = url.startsWith('https:') ? https : http
+  await mkdir(dirname(filename), recursive)
+  const output = createWriteStream(filename)
+  const { promise, resolve, reject } = allocPromise()
+  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)
+  })
+  request.on('error', reject)
+  request.end()
+  return promise
+}
+
 module.exports = {
   stripUrlHash,
   filename,
@@ -117,15 +160,8 @@ module.exports = {
   createDir: dir => mkdir(dir, recursive),
   recreateDir: dir => cleanDir(dir).then(() => mkdir(dir, recursive)),
   extractPageUrl: headers => headers['x-page-url'],
-  allocPromise () {
-    let resolve
-    let reject
-    const promise = new Promise((_resolve, _reject) => {
-      resolve = _resolve
-      reject = _reject
-    })
-    return { promise, resolve, reject }
-  },
+  allocPromise,
   noop () {},
-  pad
+  pad,
+  download
 }

package/src/ui5.js

@@ -7,6 +7,10 @@ const { capture } = require('reserve')
 const { getOutput } = require('./output')
 
 module.exports = job => {
+  if (job.noUi5) {
+    return []
+  }
+
   const [, hostName] = /https?:\/\/([^/]*)/.exec(job.ui5)
   const [, version] = /(\d+\.\d+\.\d+)?$/.exec(job.ui5)
   const cacheBase = join(job.cache || '', hostName.replace(':', '_'), version || '')

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