ui5-test-runner 3.3.2 → 3.3.4

package/package.json

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

package/src/coverage.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { join, dirname } = require('path')
+const { join, dirname, isAbsolute } = require('path')
 const { fork } = require('child_process')
 const { cleanDir, createDir, filename, download } = require('./tools')
 const { readdir, readFile, stat, writeFile, access, constants } = require('fs').promises
@@ -94,20 +94,30 @@ async function generateCoverageReport (job) {
   const coverageFilename = join(coverageMergedDir, 'coverage.json')
   await nyc(job, 'merge', job.coverageTempDir, coverageFilename)
   if (job[$coverageRemote] && !job.coverageProxy) {
-    job.status = 'Collecting remote source files'
+    job.status = 'Checking 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)
+    let changes = 0
     for (const filename of filenames) {
       const fileData = coverageData[filename]
       const { path } = fileData
+      if (isAbsolute(path)) {
+        try {
+          await access(path, constants.R_OK)
+          continue
+        } catch (e) {}
+      }
       const filePath = join(sourcesBasePath, path)
       fileData.path = filePath
       await download(origin + path, filePath)
+      ++changes
+    }
+    if (changes > 0) {
+      await writeFile(coverageFilename, JSON.stringify(coverageData))
     }
-    await writeFile(coverageFilename, JSON.stringify(coverageData))
   }
   const reporters = job.coverageReporters.map(reporter => `--reporter=${reporter}`)
   if (!job.coverageReporters.includes('text')) {
@@ -169,6 +179,9 @@ module.exports = {
         match: /(.*\.js)(\?.*)?$/,
         custom: async (request, response, url) => {
           if (!url.match(job.coverageProxyInclude) || url.match(job.coverageProxyExclude)) {
+            if (job.debugCoverage) {
+              getOutput(job).wrap(() => console.log('coverage_proxy ignore', url))
+            }
             return // Ignore
           }
           const sourcePath = join(sourcesBasePath, url)
@@ -179,6 +192,9 @@ module.exports = {
               if (sources[url]) {
                 await sources[url]
               } else {
+                if (job.debugCoverage) {
+                  getOutput(job).wrap(() => console.log('coverage_proxy instrument', url))
+                }
                 sources[url] = await download(origin + url, sourcePath)
               }
             } catch (statusCode) {

package/src/job.js

@@ -130,7 +130,7 @@ function getCommand (cwd) {
 
     // 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('--disable-ui5', '[💻] Disable UI5 mapping (also disable libs)', boolean, false)
     .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)')

package/src/ui5.js

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