ui5-test-runner 5.2.0 → 5.3.1

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)
@@ -71,6 +74,8 @@
 
   window['ui5-test-runner/stringify'] = stringify
 
+  const xPageUrl = top.location.toString()
+
   window[MODULE] = function post (url, data) {
     function request () {
       return new Promise(function (resolve, reject) {
@@ -82,18 +87,20 @@
           reject(xhr.statusText)
         })
         xhr.open('POST', base + '/_/' + url)
-        xhr.setRequestHeader('x-page-url', top.location)
+        xhr.setRequestHeader('x-page-url', xPageUrl)
         xhr.setRequestHeader('content-type', 'application/json')
         const json = stringify(data)
         xhr.setRequestHeader('content-length', json.length)
         xhr.send(json)
       })
     }
-    lastPost = lastPost
-      .then(request)
-      .then(undefined, function (reason) {
-        console.error('Failed to POST to ' + url + '\nreason: ' + reason.toString())
-      })
+    lastPost = lastPost.then(request)
+    if (!window.__unsafe__) {
+      lastPost = lastPost
+        .then(undefined, function (reason) {
+          console.error('Failed to POST to ' + url + '\nreason: ' + reason.toString())
+        })
+    }
     return lastPost
   }
 }())

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,23 @@
       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 moduleIds = QUnit.config.modules.map(({ moduleId }) => moduleId).filter(moduleId => !!moduleId)
+          const moduleNames = QUnit.config.modules.map(({ name }) => name)
+          const opa = !!window?.sap?.ui?.test?.Opa5
+          post('addTestPages', { type: 'qunit', opa, module: { ids: moduleIds.length ? moduleIds : undefined, names: moduleNames }, page: location.toString() })
+        }
       }
     }
   })