ui5-test-runner 4.4.0 → 4.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui5-test-runner",
-  "version": "4.4.0",
+  "version": "4.5.0",
   "description": "Standalone test runner for UI5",
   "main": "index.js",
   "bin": {
@@ -11,34 +11,15 @@
   },
   "scripts": {
     "lint": "standard --fix",
-    "test": "npm run test:unit && npm run test:browsers && npm run test:samples",
-    "test:browsers": "npm run test:integration:jsdom && npm run test:integration:puppeteer && npm run test:integration:selenium-webdriver-chrome && npm run test:integration:playwright",
-    "test:samples": "npm run test:samples:js && npm run test:samples:ts && npm run test:auth-sample",
-    "test:samples:js": "npm run test:sample:js:legacy && npm run test:sample:js:coverage:legacy && npm run test:sample:js:legacy-remote && npm run test:sample:js:coverage:legacy-remote && npm run test:sample:js:remote && npm run test:sample:js:coverage:remote",
-    "test:samples:ts": "npm run test:sample:ts:remote && npm run test:sample:ts:coverage:remote",
-    "test:auth-sample": "npm run test:auth-sample:remote",
-    "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": "npm run test:unit && npm run test:e2e",
+    "test:samples": "npm run test:samples:js && npm run test:samples:ts",
+    "test:samples:js": "npm run test:sample:js:legacy && npm run test:sample:js:coverage:legacy && npm run test:sample:js:legacy-remote && npm run test:sample:js:coverage:legacy-remote && npm run test:sample:js:remote && npm run test:sample:js:coverage:remote && npm run test:sample:js:basic-authent && npm run test:sample:js:legacy:split-opa && npm run test:sample:js:remote:split-opa",
+    "test:coverall": "rimraf .nyc_output && jest --coverageDirectory .nyc_output --coverageReporters json && nyc --silent --no-clean npm run test:e2e && 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",
-    "test:integration:selenium-webdriver-chrome": "node . --capabilities --browser $/selenium-webdriver.js -- --browser chrome",
-    "test:integration:jsdom": "node . --capabilities --browser $/jsdom.js",
-    "test:integration:playwright": "node . --capabilities --browser $/playwright.js",
+    "test:unit:debug": "node --inspect node_modules/jest/bin/jest.js --runInBand --no-coverage",
+    "test:e2e": "node test/e2e",
     "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",
-    "test:sample:js:legacy": "node . --cwd ./test/sample.js",
-    "test:sample:js:coverage:legacy": "node . --cwd ./test/sample.js --coverage --coverage-settings nyc.json --coverage-check-statements 67",
-    "test:sample:js:legacy-remote": "node . --port 8081 --cwd ./test/sample.js --url http://localhost:8081/test/testsuite.qunit.html",
-    "test:sample:js:coverage:legacy-remote": "node . --port 8081 --cwd ./test/sample.js --url http://localhost:8081/test/testsuite.qunit.html --coverage --coverage-settings nyc.json --coverage-check-statements 67",
-    "test:sample:js:remote": "start-server-and-test 'npm run serve:sample:js' http://localhost:8080 'node . --url http://localhost:8080/test/testsuite.qunit.html'",
-    "test:sample:js:coverage:remote": "start-server-and-test 'npm run serve:sample:js' http://localhost:8080 'node . --url http://localhost:8080/test/testsuite.qunit.html --coverage --coverage-check-statements 67'",
-    "serve:sample:js": "ui5 serve --config ./test/sample.js/ui5.yaml",
-    "test:sample:ts:remote": "start-server-and-test 'npm run serve:sample:ts' http://localhost:8080 'node . --url http://localhost:8080/test/testsuite.qunit.html'",
-    "serve:sample:ts": "cd ./test/sample.ts && node ui5.cjs serve",
-    "test:sample:ts:coverage:remote": "start-server-and-test 'npm run serve:sample:ts:coverage' http://localhost:8080 'node . --url http://localhost:8080/test/testsuite.qunit.html --coverage --coverage-check-statements 67'",
-    "serve:sample:ts:coverage": "cd ./test/sample.ts && node ui5.cjs serve --config ui5-coverage.yaml",
-    "test:auth-sample:remote": "start-server-and-test 'npm run serve:auth-sample' http://localhost:8080 'node . --url http://localhost:8080/test/testsuite.qunit.html --browser $/puppeteer.js --browser-args --basic-auth-username testUsername --browser-args --basic-auth-password testPassword'",
-    "serve:auth-sample": "cd ./test/auth_sample.js && reserve --config ./reserve.json",
     "build:doc": "node build/doc",
     "clean": "npm uninstall -g ui5-test-runner puppeteer nyc selenium-webdriver playwright webdriverio"
   },
@@ -66,18 +47,20 @@
     "mime": "^3.0.0",
     "punybind": "^1.2.1",
     "punyexpr": "^1.0.4",
-    "reserve": "^1.15.8"
+    "reserve": "^1.15.9"
   },
   "devDependencies": {
-    "@openui5/types": "^1.121.1",
-    "@ui5/cli": "^3.9.1",
+    "@openui5/types": "^1.122.1",
+    "@ui5/cli": "^3.9.2",
     "@ui5/middleware-code-coverage": "^1.1.1",
+    "dotenv": "^16.4.5",
     "jest": "^29.7.0",
     "nock": "^13.5.4",
     "nyc": "^15.1.0",
+    "rimraf": "^5.0.5",
     "standard": "^17.1.0",
     "start-server-and-test": "^2.0.3",
-    "typescript": "^5.4.2",
+    "typescript": "^5.4.5",
     "ui5-tooling-transpile": "^3.3.7"
   },
   "optionalDependencies": {

package/src/add-test-pages.js

@@ -5,34 +5,60 @@ const { URL } = require('url')
 const { getOutput } = require('./output')
 const { stripUrlHash } = require('./tools')
 
+const addUrlParam = (url, param) => {
+  if (url.includes(param)) {
+    return url
+  }
+  if (url.includes('?')) {
+    return url + '&' + param
+  }
+  return url + '?' + param
+}
+
 module.exports = {
-  async addTestPages (job, url, pages) {
-    getOutput(job).debug('probe', `addTestPages from ${url}`, pages)
+  async addTestPages (job, url, data) {
+    const { type, opa, modules, pages, page } = data
+    getOutput(job).debug('probe', `addTestPages from ${url}`, data)
     let testPageUrls
-    pages = pages.map(relativeUrl => {
-      const absoluteUrl = new URL(relativeUrl, url)
-      return stripUrlHash(absoluteUrl.toString())
-    })
-    if (job.pageFilter) {
-      const filter = new RegExp(job.pageFilter)
-      testPageUrls = pages.filter(name => name.match(filter))
+    if (type === 'none') {
+      testPageUrls = []
     } else {
-      testPageUrls = pages
-    }
-    if (job.pageParams) {
-      testPageUrls = testPageUrls.map(url => {
-        if (url.includes('?')) {
-          return url + '&' + job.pageParams
+      let receivedPages
+      if (type === 'qunit') {
+        if (job.splitOpa && opa && modules && modules.length > 1) {
+          receivedPages = modules.map(moduleId => addUrlParam(stripUrlHash(page), `moduleId=${moduleId}`))
+        } else {
+          receivedPages = [page]
         }
-        return url + '?' + job.pageParams
+      } else {
+        receivedPages = pages
+      }
+      receivedPages = receivedPages.map(relativeUrl => {
+        const absoluteUrl = new URL(relativeUrl, url)
+        return stripUrlHash(absoluteUrl.toString())
       })
+      if (job.pageFilter) {
+        const filter = new RegExp(job.pageFilter)
+        testPageUrls = receivedPages.filter(name => name.match(filter))
+      } else {
+        testPageUrls = receivedPages
+      }
+      if (job.pageParams) {
+        testPageUrls = testPageUrls.map(url => addUrlParam(url, job.pageParams))
+      }
+    }
+    let member
+    if (type === 'suite' && job.splitOpa) {
+      member = 'url'
+    } else {
+      member = 'testPageUrls'
     }
-    job.testPageUrls = testPageUrls.reduce((uniques, url) => {
+    job[member] = testPageUrls.reduce((uniques, url) => {
       if (!uniques.includes(url)) {
         uniques.push(url)
       }
       return uniques
-    }, job.testPageUrls || [])
+    }, job[member] || [])
     stop(job, url)
   }
 }

package/src/browsers.js

@@ -119,8 +119,7 @@ async function start (job, url, scripts = []) {
     resolvedScripts.unshift(`window['ui5-test-runner/base-host'] = 'http://localhost:${job.port}'
 `)
   }
-  const progress = newProgress(job)
-  progress.label = url
+  const progress = newProgress(job, url)
   const pageBrowser = {
     url,
     reportDir,

package/src/capabilities/index.js

@@ -6,8 +6,9 @@ const { join } = require('path')
 const { getOutput } = require('../output')
 const { performance } = require('perf_hooks')
 const { cleanDir, allocPromise, filename } = require('../tools')
-const { $browsers } = require('../symbols')
+const { $statusProgressTotal, $statusProgressCount } = require('../symbols')
 const tests = require('./tests')
+const parallelize = require('../parallelize')
 
 async function capabilities (job) {
   const output = getOutput(job)
@@ -17,9 +18,9 @@ async function capabilities (job) {
       job.status = 'Serving'
     } else {
       if (job.debugKeepReport) {
-        output.wrap(() => console.log('Report folder', job.reportDir, 'not cleaned because of --debug-keep-report.'))
+        output.log('Report folder', job.reportDir, 'not cleaned because of --debug-keep-report.')
       } else if (code !== 0) {
-        output.wrap(() => console.error('Report folder', job.reportDir, 'not cleaned because of errors.'))
+        output.error('Report folder', job.reportDir, 'not cleaned because of errors.')
       } else {
         await cleanDir(job.reportDir)
       }
@@ -33,7 +34,7 @@ async function capabilities (job) {
     try {
       await probe(job)
     } catch (e) {
-      output.wrap(() => console.error('Unable to probe'))
+      output.error('Unable to probe')
       exit(-1)
     }
 
@@ -90,21 +91,13 @@ async function capabilities (job) {
     const filteredTests = tests
       .filter((test) => !test.for || test.for(job.browserCapabilities))
       .filter(({ name }) => !job.debugCapabilitiesTest || name.startsWith(job.debugCapabilitiesTest))
-    output.wrap(() => console.log('Number of tests :', filteredTests.length))
+    output.log('Number of tests :', filteredTests.length)
 
     let errors = 0
 
-    const { promise: forEver } = allocPromise()
-
-    const next = async () => {
-      if (filteredTests.length === 0) {
-        if (!job[$browsers] || Object.keys(job[$browsers]).length === 0) {
-          output.wrap(() => console.log('Done.'))
-          exit(errors)
-        }
-        return
-      }
-      const { label, url, scripts, endpoint = () => { } } = filteredTests.shift()
+    const task = async (test) => {
+      const { promise, resolve } = allocPromise()
+      const { label, url, scripts, endpoint = () => { } } = test
 
       const listenerIndex = listeners.length
       let pageUrl
@@ -130,6 +123,7 @@ async function capabilities (job) {
         if (done.called) {
           return
         }
+        ++job[$statusProgressCount]
         done.called = true
         if (timeoutId) {
           clearTimeout(timeoutId)
@@ -137,15 +131,15 @@ async function capabilities (job) {
         await stop(job, pageUrl)
         const timeSpent = Math.floor(performance.now() - now)
         if (error) {
-          output.wrap(() => console.log('❌', label, `[${filename(pageUrl)}]`, error))
+          output.log('❌', label, `[${filename(pageUrl)}]`, error)
           if (job.failFast) {
             exit(1)
           }
           ++errors
         } else {
-          output.wrap(() => console.log('✔️', label, timeSpent, 'ms'))
+          output.log('✔️ ', label, timeSpent, 'ms')
         }
-        await next()
+        resolve()
       }
 
       const context = {
@@ -168,6 +162,8 @@ async function capabilities (job) {
             done('Failed')
           }
         })
+
+      return promise
     }
 
     let parallel
@@ -177,14 +173,14 @@ async function capabilities (job) {
       parallel = job.parallel
     }
 
-    const testsCount = filteredTests.length
-    for (let i = 0; i < Math.max(Math.min(parallel, testsCount), 1); ++i) {
-      next()
-    }
+    job[$statusProgressTotal] = filteredTests.length
+    job[$statusProgressCount] = 0
+    await parallelize(task, filteredTests, parallel)
 
-    await forEver
+    output.log('Done.')
+    exit(errors)
   } catch (error) {
-    output.wrap(() => console.error(error))
+    output.error(error)
     exit(-1)
   }
 }

package/src/capabilities/tests/scripts/index.js

@@ -34,12 +34,13 @@ module.exports = [{
   scripts: ['post.js', 'qunit-redirect.js'],
   endpoint: function (data) {
     assert(data.endpoint === 'addTestPages', 'addTestPages was triggered')
-    assert(data.body.length === 2, 'Two pages received')
+    assert(data.body.type === 'suite', 'type = suite')
+    assert(data.body.pages.length === 2, 'Two pages received')
     const pages = [
       '/unit/unitTests.qunit.html',
       '/integration/opaTests.iframe.qunit.html'
     ]
-    pages.forEach((page, index) => assert(data.body[index].endsWith(page), page))
+    pages.forEach((page, index) => assert(data.body.pages[index].endsWith(page), page))
   }
 }, {
   label: 'Scripts (External QUnit)',

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

@@ -34,8 +34,17 @@ async function main () {
     tests="${module.tests.length}"
   >`)
       for (const test of module.tests) {
+        let time
+        if (test.start && test.end) {
+          time = (new Date(test.end) - new Date(test.start)) / 1000
+        }
         o(`    <testcase
-      name="${xmlEscape(test.name)}"
+      name="${xmlEscape(test.name)}" ${
+        time === undefined
+        ? ''
+        : `
+      time="${time}"`
+}
     >`)
         if (test.skip) {
           o('      <skipped></skipped>')

package/src/defaults/selenium-webdriver/chrome.js

@@ -10,16 +10,17 @@ module.exports = async ({
   const chrome = require(join(settings.modules['selenium-webdriver'], 'chrome'))
 
   const chromeOptions = new chrome.Options()
-  chromeOptions.excludeSwitches('enable-logging')
   if (!options.visible) {
-    chromeOptions.addArguments('headless')
+    chromeOptions.addArguments('--headless=new')
+    chromeOptions.addArguments('--log-level=3')
   }
-  chromeOptions.addArguments('start-maximized')
-  chromeOptions.addArguments('disable-extensions')
+  chromeOptions.addArguments('--start-maximized')
+  chromeOptions.addArguments('--disable-extensions')
   chromeOptions.setLoggingPrefs(loggingPreferences)
   if (options.binary) {
-    chromeOptions.setBinary(options.binary)
+    chromeOptions.setChromeBinaryPath(options.binary)
   }
+  chromeOptions.excludeSwitches('--enable-logging')
 
   const builder = new Builder()
     .forBrowser(Browser.CHROME)

package/src/inject/post.js

@@ -82,7 +82,7 @@
           reject(xhr.statusText)
         })
         xhr.open('POST', base + '/_/' + url)
-        xhr.setRequestHeader('x-page-url', location)
+        xhr.setRequestHeader('x-page-url', top.location)
         xhr.send(stringify(data))
       })
     }

package/src/inject/qunit-hooks.js

@@ -20,8 +20,9 @@
 
   function getModules () {
     if (QUnit.config && QUnit.config.modules) {
-      return QUnit.config.modules.map(({ name, tests }) => ({
+      return QUnit.config.modules.map(({ name, moduleId, tests }) => ({
         name,
+        moduleId,
         tests: tests.map(({ name, testId, skip }) => ({ name, testId, skip }))
       }))
     }

package/src/inject/qunit-redirect.js

@@ -6,6 +6,7 @@
     return // already installed
   }
   window[MODULE] = true
+  window['ui5-test-runner/qunit-hooks'] = true // prevents qunit-hooks
 
   /* global suite */
 
@@ -21,14 +22,41 @@
 
   window.jsUnitTestSuite = jsUnitTestSuite
 
+  let QUnit
+
+  Object.defineProperty(window, 'QUnit', {
+    get: function () {
+      return QUnit
+    },
+
+    set: function (value) {
+      QUnit = value
+
+      const { test } = QUnit
+      QUnit.test = (label) => test(label, (assert) => assert.ok(true, label))
+
+      let timeoutId
+      QUnit.moduleDone(function () {
+        if (timeoutId) {
+          clearTimeout(timeoutId)
+        }
+        timeoutId = setTimeout(notify, 10)
+      })
+
+      function notify () {
+        const modules = QUnit.config.modules.map(({ moduleId }) => moduleId)
+        const opa = !!window?.sap?.ui?.test?.Opa5
+        post('addTestPages', { type: 'qunit', opa, modules, page: location.toString() })
+      }
+    }
+  })
+
   window.addEventListener('load', function () {
     if (typeof suite === 'function') {
       suite()
-      post('addTestPages', pages)
-    } else if (typeof QUnit === 'object') {
-      post('addTestPages', [location.toString()])
-    } else {
-      post('addTestPages', []) // No page
+      post('addTestPages', { type: 'suite', pages })
+    } else if (!QUnit) {
+      post('addTestPages', { type: 'none ' })
     }
   })
 }())

package/src/job-mode.js

@@ -30,7 +30,8 @@ function buildAndCheckMode (job) {
       'browserCloseTimeout',
       'failFast',
       'keepAlive',
-      'alternateNpmPath'
+      'alternateNpmPath',
+      'outputInterval'
     ])
     return 'capabilities'
   }

package/src/job.js

@@ -99,7 +99,7 @@ function getCommand (cwd) {
     .option('-fo, --fail-opa-fast [flag]', '[💻🔗] Stop the OPA page execution after the first failing test', boolean, false)
     .option('-k, --keep-alive [flag]', '[💻🔗🧪] Keep the server alive', boolean, false)
     .option('-l, --log-server [flag]', '[💻🔗🧪] Log inner server traces', boolean, false)
-    .option('-p, --parallel <count>', '[💻🔗🧪] Number of parallel tests executions', 2)
+    .option('-p, --parallel <count>', '[💻🔗🧪] Number of parallel tests executions', integer, 2)
     .option('-b, --browser <command>', '[💻🔗🧪] Browser instantiation command (relative to cwd or use $/ for provided ones)', '$/puppeteer.js')
     .option('--browser-args <argument...>', '[💻🔗🧪] Browser instantiation command parameters (use -- instead)')
     .option('--alternate-npm-path <path>', '[💻🔗] Alternate NPM path to look for packages (priority: local, alternate, global)')
@@ -118,8 +118,9 @@ function getCommand (cwd) {
     .option('--screenshot [flag]', '[💻🔗] Take screenshots during the tests execution (if supported by the browser)', boolean, true)
     .option('--no-screenshot', '[💻🔗] Disable screenshots')
     .option('-st, --screenshot-timeout <timeout>', '[💻🔗] Maximum waiting time for browser screenshot', timeout, 5000)
+    .option('-so, --split-opa', '[💻🔗] Split OPA tests using QUnit modules', boolean, false)
     .option('-rg, --report-generator <path...>', '[💻🔗] Report generator paths (relative to cwd or use $/ for provided ones)', ['$/report.js'])
-    .option('--progress-page <path>', '[💻🔗] progress page path (relative to cwd or use $/ for provided ones)', '$/report/default.html')
+    .option('--progress-page <path>', '[💻🔗] Progress page path (relative to cwd or use $/ for provided ones)', '$/report/default.html')
 
     .option('--coverage [flag]', '[💻🔗] Enable or disable code coverage', boolean)
     .option('--no-coverage', '[💻🔗] Disable code coverage')
@@ -321,6 +322,25 @@ function finalize (job) {
     enumerable: false,
     configurable: false
   })
+
+  /* istanbul ignore next */
+  if (process.env.DEBUG_ON_FAILED) {
+    let failed
+    Object.defineProperty(job, 'failed', {
+      get () {
+        return failed
+      },
+      set (value) {
+        if (value) {
+          // eslint-disable-next-line no-debugger
+          debugger
+        }
+        failed = value
+      },
+      enumerable: true,
+      configurable: false
+    })
+  }
 }
 
 function fromCmdLine (cwd, args) {

package/src/output.js

@@ -79,7 +79,7 @@ function * bar (ratio, msg) {
     }
     yield ']     '
   } else {
-    const filled = Math.floor(BAR_WIDTH * ratio)
+    const filled = Math.floor(BAR_WIDTH * Math.min(ratio, 1))
     yield ''.padEnd(filled, '\u2588')
     yield ''.padEnd(BAR_WIDTH - filled, '\u2591')
     yield '] '
@@ -117,6 +117,13 @@ class Progress {
 }
 
 function progress (job, cleanFirst = true) {
+  if (process.send) {
+    process.send({
+      type: 'progress',
+      count: job[$statusProgressCount],
+      total: job[$statusProgressTotal]
+    })
+  }
   const sequence = []
   if (interactive) {
     if (cleanFirst) {
@@ -250,8 +257,6 @@ function build (job) {
     reportIntervalId: undefined,
     lines: 0,
 
-    wrap: wrap(callback => callback()),
-
     version: () => {
       const { name, version } = require(join(__dirname, '../package.json'))
       log(job, p80()`${name}@${version}`)
@@ -261,6 +266,14 @@ function build (job) {
       log(job, p80()`Server running at ${pad.lt(url)}`)
     },
 
+    log: wrap((...texts) => {
+      log(job, ...texts)
+    }),
+
+    error: wrap((...texts) => {
+      err(job, ...texts)
+    }),
+
     debug: (moduleSpecifier, ...args) => {
       const [mainModule] = moduleSpecifier.split('/')
       if (job.debugVerbose && (job.debugVerbose.includes(moduleSpecifier) || job.debugVerbose.includes(mainModule))) {
@@ -310,7 +323,7 @@ function build (job) {
     reportOnJobProgress () {
       if (interactive) {
         this.reportIntervalId = setInterval(progress.bind(null, job), 250)
-      } else if (job.outputInterval) {
+      } else if (job.outputInterval && !inJest) {
         this.reportIntervalId = setInterval(progress.bind(null, job), job.outputInterval)
       }
     },
@@ -563,6 +576,8 @@ function build (job) {
 }
 
 module.exports = {
+  interactive,
+
   getOutput (job) {
     if (!job[$output]) {
       job[$output] = build(job)
@@ -570,7 +585,9 @@ module.exports = {
     return job[$output]
   },
 
-  newProgress (job) {
-    return new Progress(job)
+  newProgress (job, label, total, count) {
+    const progress = new Progress(job)
+    Object.assign(progress, { label, total, count })
+    return progress
   }
 }

package/src/parallelize.js

@@ -0,0 +1,61 @@
+const { allocPromise } = require('./tools')
+
+function complete (task) {
+  ++task.completed
+  if (--task.active === 0) {
+    task.resolve()
+  }
+}
+
+async function run (task) {
+  const {
+    method,
+    list,
+    parallel,
+    started,
+    completed,
+    stop,
+    reject
+  } = task
+  const { length } = list
+  if (stop || completed === length || started === length) {
+    complete(task)
+    return
+  }
+  if (task.active < parallel && length - started > task.active) {
+    ++task.active
+    run(task)
+  }
+  const index = task.started++
+  const parameter = list[index]
+  try {
+    await method(parameter, index, list)
+  } catch (error) {
+    task.stop = true
+    reject(error)
+  }
+  let remaining = list.length - index - 1
+  while (task.active < (parallel + 1) && remaining) {
+    --remaining
+    ++task.active
+    run(task)
+  }
+  complete(task)
+}
+
+module.exports = function parallelize (method, list, parallel) {
+  const { promise, resolve, reject } = allocPromise()
+  const task = {
+    method,
+    list,
+    parallel,
+    started: 0,
+    completed: 0,
+    active: 1,
+    stop: false,
+    resolve,
+    reject
+  }
+  run(task)
+  return promise
+}

package/src/qunit-hooks.js

@@ -21,7 +21,6 @@ function invalidTestId (job, url, testId) {
 }
 
 function merge (targetModules, modules) {
-  let count = 0
   modules.forEach(module => {
     const { name } = module
     const targetModule = targetModules.filter(({ name: targetName }) => name === targetName)[0]
@@ -35,9 +34,16 @@ function merge (targetModules, modules) {
         }
       })
     }
-    count += module.tests.length
   })
-  return count
+}
+
+function filterModules (modules, url) {
+  const moduleMatch = url.match(/\?.*\bmoduleId=([^&]+)/)
+  if (moduleMatch) {
+    const [, moduleId] = moduleMatch
+    return modules.filter(module => module.moduleId === moduleId)
+  }
+  return modules
 }
 
 function get (job, urlWithHash, { testId, modules, isOpa } = {}) {
@@ -47,9 +53,8 @@ function get (job, urlWithHash, { testId, modules, isOpa } = {}) {
   if (!page) {
     error(job, url, `No QUnit page found for ${urlWithHash}`)
   }
-  if (modules && modules.length) {
-    progress.total = page.count = merge(page.modules, modules)
-  }
+  merge(page.modules, filterModules(modules || [], url))
+  progress.total = page.count = page.modules.reduce((total, { tests }) => total + tests.length, 0)
   if (!page.isOpa && isOpa) {
     page.isOpa = true
   }
@@ -104,7 +109,7 @@ module.exports = {
 
   async begin (job, urlWithHash, details) {
     getOutput(job).debug('qunit/begin', 'begin', urlWithHash, details)
-    const { isOpa, totalTests, modules } = details
+    const { isOpa, modules } = details
     const url = stripUrlHash(urlWithHash)
     if (!job.qunitPages) {
       job.qunitPages = {}
@@ -115,13 +120,13 @@ module.exports = {
       isOpa: !!isOpa,
       failed: 0,
       passed: 0,
-      count: totalTests,
-      modules
+      count: 0,
+      modules: []
     }
     job.qunitPages[url] = qunitPage
-    const { progress } = get(job, url)
+    const { page, progress } = get(job, url, { modules })
     progress.count = 0
-    progress.total = totalTests
+    progress.total = page.count
   },
 
   async testStart (job, urlWithHash, details) {

package/src/symbols.js

@@ -1,9 +1,5 @@
 module.exports = {
   $browsers: Symbol('browsers'),
-  $probeUrlsStarted: Symbol('probeUrlsStarted'),
-  $probeUrlsCompleted: Symbol('probeUrlsCompleted'),
-  $testPagesStarted: Symbol('testPagesStarted'),
-  $testPagesCompleted: Symbol('testPagesCompleted'),
   $valueSources: Symbol('valueSources'),
   $remoteOnLegacy: Symbol('remoteOnLegacy'),
   $proxifiedUrls: Symbol('proxifiedUrls'),

package/src/tests.js

@@ -1,68 +1,49 @@
 'use strict'
 
-const { probe, start } = require('./browsers')
+const { probe: probeBrowser, start } = require('./browsers')
 const { instrument } = require('./coverage')
 const { recreateDir } = require('./tools')
 const { globallyTimedOut } = require('./timeout')
 const { save, generate } = require('./report')
 const { getOutput } = require('./output')
 const {
-  $probeUrlsStarted,
-  $probeUrlsCompleted,
-  $testPagesStarted,
-  $testPagesCompleted,
   $statusProgressTotal,
-  $statusProgressCount
+  $statusProgressCount,
+  $proxifiedUrls
 } = require('./symbols')
 const { UTRError } = require('./error')
-const { $proxifiedUrls } = require('./symbols')
 const { preload } = require('./ui5')
+const parallelize = require('./parallelize')
 
-async function run (task, job) {
-  const {
-    urlsMember,
-    startedMember,
-    completedMember,
-    method
-  } = task
-  const output = getOutput(job)
-  const urls = job[urlsMember]
-  const { length } = urls
-  if (job[$statusProgressTotal] === undefined) {
+function task (job, method) {
+  return async (url, index, { length }) => {
+    if (job[$statusProgressCount] === undefined) {
+      job[$statusProgressCount] = 0
+    }
     job[$statusProgressTotal] = length
-    job[$statusProgressCount] = 0
-  }
-  if (job[completedMember] === length) {
-    return
-  }
-  if (job[startedMember] === length) {
-    return
-  }
-  const index = job[startedMember]++
-  const url = urls[index]
-  if (globallyTimedOut(job)) {
-    output.globalTimeout(url)
-    job.failed = true
-    job.timedOut = true
-  } else if (job.failFast && job.failed) {
-    output.failFast(url)
-  } else {
-    try {
-      await method(job, url)
-    } catch (error) {
+    const output = getOutput(job)
+    if (globallyTimedOut(job)) {
+      output.globalTimeout(url)
       job.failed = true
+      job.timedOut = true
+    } else if (job.failFast && job.failed) {
+      output.failFast(url)
+    } else {
+      try {
+        await method(job, url)
+      } catch (error) {
+        job.failed = true
+      }
     }
+    ++job[$statusProgressCount]
   }
-  ++job[completedMember]
-  ++job[$statusProgressCount]
-  return run(task, job)
 }
 
 async function probeUrl (job, url) {
   const output = getOutput(job)
   try {
     let scripts
-    if (job.mode === 'url' && job.browserCapabilities.scripts) {
+    if (job.browserCapabilities.scripts) {
       scripts = [
         'post.js',
         'qunit-redirect.js'
@@ -111,48 +92,32 @@ async function runTestPage (job, url) {
   }
 }
 
-function parallelize (task, job) {
-  const {
-    urlsMember,
-    completedMember,
-    startedMember
-  } = task
-  job[startedMember] = 0
-  job[completedMember] = 0
-  const max = Math.min(job.parallel, job[urlsMember].length)
-  const promises = []
-  for (let i = 0; i < max; ++i) {
-    promises.push(run(task, job))
-  }
-  return Promise.all(promises)
-}
-
 async function process (job) {
   const output = getOutput(job)
   job.start = new Date()
-  delete job.failed
+  job.failed = false
   await instrument(job)
   await save(job)
   job.testPageUrls = []
 
   job.status = 'Probing urls'
-  await parallelize({
-    urlsMember: 'url',
-    startedMember: $probeUrlsStarted,
-    completedMember: $probeUrlsCompleted,
-    method: probeUrl
-  }, job)
+  try {
+    await parallelize(task(job, probeUrl), job.url, job.parallel)
+  } catch (e) {
+    output.genericError(e)
+    job.failed = true
+  }
 
   /* istanbul ignore else */
-  if (!job.debugProbeOnly) {
+  if (!job.debugProbeOnly && !job.failed) {
     if (job.testPageUrls.length !== 0) {
       job.status = 'Executing test pages'
-      await parallelize({
-        urlsMember: 'testPageUrls',
-        startedMember: $testPagesStarted,
-        completedMember: $testPagesCompleted,
-        method: runTestPage
-      }, job)
+      try {
+        await parallelize(task(job, runTestPage), job.testPageUrls, job.parallel)
+      } catch (e) {
+        output.genericError(e)
+        job.failed = true
+      }
     } else if (Object.keys(job.qunitPages || []).length === 0) {
       output.noTestPageFound()
       job.failed = true
@@ -169,7 +134,7 @@ module.exports = {
     if (job.preload) {
       await preload(job)
     }
-    await probe(job)
+    await probeBrowser(job)
     if (job.mode !== 'url') {
       job.url = [`http://localhost:${job.port}/${job.testsuite}`]
     } else if (!job.browserCapabilities.scripts) {

package/src/ui5.js

@@ -5,8 +5,9 @@ const { createWriteStream } = require('fs')
 const { mkdir, unlink, stat } = require('fs').promises
 const { capture } = require('reserve')
 const { getOutput, newProgress } = require('./output')
-const { download, allocPromise } = require('./tools')
+const { download } = require('./tools')
 const { $statusProgressCount, $statusProgressTotal } = require('./symbols')
+const parallelize = require('./parallelize')
 
 const buildCacheBase = job => {
   const [, hostName] = /https?:\/\/([^/]*)/.exec(job.ui5)
@@ -34,31 +35,15 @@ module.exports = {
     const lib = async name => {
       progress.label = name
       progress.count = 0
-      const { promise, resolve/*, reject */ } = allocPromise()
       const libPath = name.replace(/\./g, '/') + '/'
       const { resources } = require(await get(libPath + 'resources.json'))
       progress.total = resources.length
-      let index = 0
-      let active = 0
-
-      const task = async () => {
-        ++active
-        const { name, size } = resources[index++]
+      progress.label = `${name} (${resources.length} files)`
+      await parallelize(async ({ name, size }) => {
         await get(libPath + name, size)
         ++progress.count
-        if (index < resources.length) {
-          task()
-        }
-        if (--active === 0) {
-          resolve()
-        }
-      }
-
-      for (let parallel = 0; parallel < 8; ++parallel) {
-        task()
-      }
-
-      return promise
+      }, resources, 8)
+      ++job[$statusProgressCount]
     }
 
     job.status = 'Preloading UI5'
@@ -67,11 +52,7 @@ module.exports = {
     await get('sap-ui-version.json')
     await get('sap-ui-core.js')
     const progress = newProgress(job)
-    await lib('sap.ui.core')
-    for (const name of job.preload) {
-      ++job[$statusProgressCount]
-      await lib(name)
-    }
+    await parallelize(lib, ['sap.ui.core', ...job.preload], 1)
     progress.done()
   },
 

package/src/defaults/report/common.js

@@ -1,38 +0,0 @@
-(function () {
-  /* global punybind, punyexpr */
-
-  const report = {}
-
-  report.elapsed = function (start, end = Date.now()) {
-    if (typeof end === 'string') {
-      end = new Date(end).getTime()
-    }
-    if (typeof start === 'string') {
-      start = new Date(start).getTime()
-    }
-    const ms = end - start
-    if (isNaN(ms)) {
-      return '-'
-    }
-    if (ms > 5000) {
-      const mins = Math.floor(ms / 60000)
-      const secs = Math.floor((ms % 60000) / 1000)
-      return `${mins.toString().padStart(2, 0)}:${secs.toString().padStart(2, 0)}`
-    }
-    return `${ms} ms`
-  }
-
-  let setReady
-  report.ready = new Promise(resolve => {
-    setReady = resolve
-  })
-
-  window.addEventListener('load', () => {
-    const safebind = punybind.use({
-      compiler: punyexpr
-    })
-    safebind(document.body).then(setReady)
-  })
-
-  window.report = report
-}())

package/src/defaults/report/default.html

@@ -1,97 +0,0 @@
-<html>
-  <head>
-    <title>ui5-test-runner</title>
-    <link rel="stylesheet" href="/_/report/styles.css">
-    <script src="/_/punyexpr.js"></script>
-    <script src="/_/punybind.js"></script>
-    <script src="/_/report/common.js"></script>
-    <script src="/_/report/main.js"></script>
-  </head>
-  <body>
-    <div {{if}}="!(qunitPage || qunitTest)">
-      <h1>{{ status || 'Test report' }}</h1>
-      <div {{if}}="end === undefined" class="elapsed">In progress since {{ elapsed(start) }}</div>
-      <div {{else}} class="elapsed">Duration : {{ elapsed(start, end) }} <a href="#" id="download">&#128230;</a></div>
-      <div {{if}}="timedOut">
-        &#9202;&#65039; Timed out
-      </div>
-      <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>
-          <th class="count">Failed</th>
-          <th class="elapsed">Elapsed</th>
-        </tr>
-        <tr {{for}}="url of testPageUrls">
-          <td class="truncated">
-              <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 {{elseif}}="qunitPages[url].start" title="Unit test">&#129514;</span>
-          </td>
-          <td>
-            <span {{if}}="!qunitPages[url]">-</span>
-            <span {{elseif}}="qunitPages[url].failed">&#10060;</span>
-            <span {{elseif}}="qunitPages[url].end">&#10004;&#65039;</span>
-            <span {{if}}="!qunitPages[url].end">
-              <progress max="{{ qunitPages[url].count }}" value="{{ qunitPages[url].failed + qunitPages[url].passed }}"></progress>
-            </span>
-          </td>
-          <td>{{ qunitPages[url] ? qunitPages[url].count : '-' }}</td>
-          <td>{{ qunitPages[url] ? qunitPages[url].passed : '-' }}</td>
-          <td>{{ qunitPages[url] ? qunitPages[url].failed : '-' }}</td>
-          <td>
-            <span {{if}}="!qunitPages[url]">-</span>
-            <span {{elseif}}="qunitPages[url].end === undefined">{{ elapsed(qunitPages[url].start) }}</span>
-            <span {{else}}>{{ elapsed(qunitPages[url].start, qunitPages[url].end) }}</span>
-          </td>
-        </tr>
-      </table>
-    </div>
-    <div {{if}}="qunitPage">
-      <h1 class="truncated">{{ qunitPage.url }}</h1>
-      <a href="#">&#9204; back to report</a>
-      <div {{if}}="qunitPage.end === undefined" class="elapsed">In progress since {{ elapsed(qunitPage.start) }}</div>
-      <div {{else}} class="elapsed">Duration : {{ elapsed(qunitPage.start, qunitPage.end) }}</div>
-      <div {{if}}="timedOut">
-        &#9202;&#65039; Timed out
-      </div>
-      <div {{for}}="module of qunitPage.modules">
-        <h2>{{ module.name }}</h2>
-        <div {{for}}="test of module.tests">
-          <a {{if}}="!test.skip" href="#{{ qunitPage.id }}-{{ test.testId }}">{{ test.name }}</a>
-          <span {{else}}>{{ test.name }}</span>
-          <span {{if}}="test.skip">&#9208;&#65039;</span>
-          <span {{elseif}}="!test.end" class="elapsed">{{ elapsed(test.start) }}</span>
-          <span {{elseif}}="test.report && !test.report.failed">&#10004;&#65039; {{ elapsed(test.start, test.end) }}</span>
-          <span {{elseif}}="test.report">&#10060;  {{ elapsed(test.start, test.end) }}</span>
-        </div>
-      </div>
-    </div>
-    <div {{elseif}}="qunitTest">
-      <h1 class="truncated">{{ qunitTest.url }}</h1>
-      <a href="#">&#9204; back to report</a>
-      <h2>{{ qunitTest.module }}</h2>
-      <a href="#{{ qunitTest.pageId }}">&#9204; back to page</a>
-      <h3>{{ qunitTest.name }}
-        <span {{if}}="qunitTest.report && qunitTest.report.passed">&#10004;&#65039;</span>
-        <span {{elseif}}="qunitTest.report">&#10060;</span>
-      </h3>
-      <div {{if}}="qunitTest.end === undefined" class="elapsed">In progress since {{ elapsed(qunitTest.start) }}</div>
-      <div {{else}} class="elapsed">Duration : {{ elapsed(qunitTest.start, qunitTest.end) }}</div>
-      <div {{for}}="log of qunitTest.logs">
-        <pre {{if}}="log.result">&#10004;&#65039; {{ log.message }}</pre>
-        <pre {{else}}>&#10060; {{ log.message }}</pre>
-        <img {{if}}="log.screenshot" loading="lazy" class="log" src="{{ qunitTest.pageId }}/{{ log.screenshot }}" alt="Copy folder '{{ qunitTest.pageId }}' from the job report">
-      </div>
-      <img {{if}}="qunitTest.screenshot" loading="lazy" class="log" src="{{ qunitTest.pageId }}/{{ qunitTest.screenshot }}" alt="Copy folder '{{ qunitTest.pageId }}' from the job report">
-    </div>
-    <div style="display: {{ disconnected ? 'block' : 'none' }};">&#10060; Disconnected</div>
-  </body>
-</html>

package/src/defaults/report/main.js

@@ -1,69 +0,0 @@
-/* global report, job */
-report.ready.then(update => {
-  const hashChange = hash => {
-    const [, pageId, testId] = (hash || '').match(/#?([^-]*)(?:-(.*))?/)
-    let [qunitPage, qunitTest] = [null, null]
-    if (pageId) {
-      const url = Object.keys(job.qunitPages).find(pageUrl => job.qunitPages[pageUrl].id === pageId)
-      if (!url) {
-        return
-      }
-      qunitPage = { url, ...job.qunitPages[url] }
-      if (testId) {
-        let test
-        let moduleName
-        qunitPage.modules.every(module => module.tests.every(candidate => {
-          if (candidate.testId === testId) {
-            moduleName = module.name
-            test = candidate
-            return false
-          }
-          return true
-        }))
-        qunitPage = null
-        if (test) {
-          qunitTest = {
-            url,
-            pageId,
-            module: moduleName,
-            ...test
-          }
-        }
-      }
-    }
-    update({
-      ...job,
-      qunitPage,
-      qunitTest,
-      elapsed: report.elapsed
-    })
-  }
-
-  window.addEventListener('hashchange', () => {
-    hashChange(location.hash)
-  })
-  if (window.location.href === 'about:srcdoc') {
-    window.addEventListener('click', (event) => {
-      const { href } = event.target
-      if (href) {
-        const lastHash = href.lastIndexOf('#')
-        hashChange(href.substring(lastHash))
-      }
-      event.preventDefault()
-      return false
-    })
-  }
-  hashChange(location.hash)
-
-  window.addEventListener('click', (event) => {
-    if (event.target.id === 'download') {
-      const link = this.document.createElement('a')
-      const blob = new Blob([JSON.stringify(job)], {
-        type: 'application/json'
-      })
-      link.setAttribute('href', URL.createObjectURL(blob))
-      link.setAttribute('download', 'ui5-test-runner-job.json')
-      link.click()
-    }
-  })
-})

package/src/defaults/report/progress.js

@@ -1,60 +0,0 @@
-(function () {
-  /* global report */
-
-  report.ready.then(update => {
-    let lastState = {}
-
-    async function retry () {
-      try {
-        await fetch('/_/progress', { method: 'INFO' })
-        location.hash = ''
-        refresh()
-      } catch (e) {
-        setTimeout(retry, 250)
-      }
-    }
-
-    async function refresh () {
-      const [, page, test] = location.hash.match(/#?([^-]*)(?:-(.*))?/)
-      let url = '/_/progress'
-      if (page) {
-        url += `?page=${page}`
-        if (test) {
-          url += `&test=${test}`
-        }
-      }
-      let json
-      try {
-        const response = await fetch(url)
-        json = await response.json()
-      } catch (e) {
-        update({
-          ...lastState,
-          disconnected: true
-        })
-        retry()
-        return
-      }
-      if (test) {
-        lastState = {
-          qunitTest: json
-        }
-      } else if (page) {
-        lastState = {
-          qunitPage: json
-        }
-      } else {
-        lastState = {
-          ...json
-        }
-      }
-      update({
-        ...lastState,
-        disconnected: false,
-        elapsed: report.elapsed
-      })
-      setTimeout(refresh, 250)
-    }
-    refresh()
-  })
-}())

package/src/defaults/report/styles.css

@@ -1,66 +0,0 @@
-body {
-  font-family: "Segoe UI", Arial, sans-serif;
-}
-
-h1 {
-  margin-bottom: 0;
-}
-
-h2 {
-  margin-bottom: 0;
-}
-
-h3 {
-  margin-bottom: 0;
-}
-
-progress {
-  width: 5rem;
-}
-
-th {
-  text-align: left;
-}
-
-th.count {
-  width: 5rem;
-}
-
-th.elapsed {
-  width: 6rem;
-}
-
-th.status {
-  width: 10rem;
-}
-
-a, a:hover {
-  color: black;
-  text-decoration: none;
-}
-
-a:hover {
-  text-decoration: underline;
-  text-decoration-style: dotted;
-}
-
-table {
-  table-layout: fixed;
-  width: 100%;
-}
-
-.truncated {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  direction: rtl;
-  text-align: left;
-}
-
-img.log {
-  width: 50%;
-}
-
-img.log:hover {
-  width: unset;
-}