ui5-test-runner 5.2.0 → 5.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui5-test-runner",
-  "version": "5.2.0",
+  "version": "5.3.0",
   "description": "Standalone test runner for UI5",
   "main": "index.js",
   "bin": {
@@ -46,21 +46,21 @@
     "commander": "^12.1.0",
     "punybind": "^1.2.1",
     "punyexpr": "^1.0.4",
-    "reserve": "2.0.1"
+    "reserve": "2.0.2"
   },
   "devDependencies": {
-    "@openui5/types": "^1.124.1",
-    "@ui5/cli": "^3.10.3",
+    "@openui5/types": "^1.125.0",
+    "@ui5/cli": "^3.11.0",
     "@ui5/middleware-code-coverage": "^1.1.1",
     "dotenv": "^16.4.5",
     "jest": "^29.7.0",
     "nock": "^13.5.4",
-    "nyc": "^15.1.0",
+    "nyc": "^17.0.0",
     "rimraf": "^5.0.7",
     "standard": "^17.1.0",
     "start-server-and-test": "^2.0.4",
-    "typescript": "^5.4.5",
-    "ui5-tooling-transpile": "^3.4.3"
+    "typescript": "^5.5.2",
+    "ui5-tooling-transpile": "^3.4.5"
   },
   "optionalDependencies": {
     "fsevents": "^2.3.3"

package/src/coverage.js

@@ -310,13 +310,27 @@ module.exports = {
       await setupNyc(job)
       // Assuming all files are coming from the same server
       const { origin } = new URL(job.url[0])
-      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))
+      let instrument
+      try {
+        const { createInstrumenter } = require(join(await nycInstallationPath, 'node_modules/istanbul-lib-instrument'))
+        const instrumenter = createInstrumenter({
+          produceSourceMap: true,
+          coverageGlobalScope: 'window.top',
+          coverageGlobalScopeFunc: false
+        })
+        instrument = promisify(instrumenter.instrument.bind(instrumenter))
+      } catch (e) {
+        // Recent version of nyc offers a different interface
+        const createInstrumenter = require(join(await nycInstallationPath, 'lib/instrumenters/istanbul.js'))
+        const instrumenter = createInstrumenter({
+          produceSourceMap: true
+        })
+        instrument = async function (code, sourcePath) {
+          return instrumenter.instrumentSync(code, sourcePath, { registerMap: () => {} })
+            // TODO use regular expression !
+            .replace(globalContextSearch, globalContextReplace)
+        }
+      }
       const sources = {}
       return [{
         match: /(.*\.js)(\?.*)?$/,

package/src/inject/post.js

@@ -9,14 +9,17 @@
   const base = window['ui5-test-runner/base-host'] || ''
 
   let lastPost = Promise.resolve()
-  let UI5Object
+
+  function isUI5Object (obj) {
+    return typeof obj === 'object' &&
+      obj !== null &&
+      typeof obj.getId === 'function' &&
+      typeof obj.getMetadata === 'function'
+  }
 
   function stringify (data) {
     const objects = []
     const referenced = []
-    if (!UI5Object && window.sap && window.sap.ui && window.sap.ui.base) {
-      UI5Object = window.sap.ui.base.Object
-    }
     const ui5Summary = obj => {
       const id = obj.getId && obj.getId()
       const className = obj.getMetadata && obj.getMetadata() && obj.getMetadata().getName()
@@ -27,7 +30,7 @@
     }
     const simple = JSON.stringify(data, function (key, value) {
       if (typeof value === 'object' && value) {
-        if (UI5Object && value instanceof UI5Object) {
+        if (isUI5Object(value)) {
           return ui5Summary(value)
         }
         const id = objects.indexOf(value)
@@ -45,7 +48,7 @@
     const stringified = []
     return JSON.stringify(data, function (key, value) {
       if (typeof value === 'object' && value) {
-        if (UI5Object && value instanceof UI5Object) {
+        if (isUI5Object(value)) {
           return ui5Summary(value)
         }
         const id = objects.indexOf(value)

package/src/inject/qunit-intercept.js

@@ -29,7 +29,9 @@
     set: function (value) {
       QUnit = value
       Object.keys(callbacks).forEach(property => {
-        QUnit[property](callbacks[property])
+        if (typeof QUnit[property] === 'function') {
+          QUnit[property](callbacks[property])
+        }
       })
     }
   })

package/src/inject/qunit-redirect.js

@@ -33,20 +33,22 @@
       QUnit = value
 
       const { test } = QUnit
-      QUnit.test = (label) => test(label, (assert) => assert.ok(true, label))
+      if (typeof test === 'function') {
+        QUnit.test = (label) => test(label, (assert) => assert.ok(true, label))
 
-      let timeoutId
-      QUnit.moduleDone(function () {
-        if (timeoutId) {
-          clearTimeout(timeoutId)
-        }
-        timeoutId = setTimeout(notify, 10)
-      })
+        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() })
+        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() })
+        }
       }
     }
   })