ui5-test-runner 1.1.1 → 1.1.4

package/README.md

@@ -3,8 +3,6 @@
 [![Node.js CI](https://github.com/ArnaudBuchholz/ui5-test-runner/actions/workflows/node.js.yml/badge.svg)](https://github.com/ArnaudBuchholz/ui5-test-runner/actions/workflows/node.js.yml)
 [![Package Quality](https://npm.packagequality.com/shield/ui5-test-runner.svg)](https://packagequality.com/#?package=ui5-test-runner)
 [![Known Vulnerabilities](https://snyk.io/test/github/ArnaudBuchholz/ui5-test-runner/badge.svg?targetFile=package.json)](https://snyk.io/test/github/ArnaudBuchholz/ui5-test-runner?targetFile=package.json)
-[![dependencies Status](https://david-dm.org/ArnaudBuchholz/ui5-test-runner/status.svg)](https://david-dm.org/ArnaudBuchholz/ui5-test-runner)
-[![devDependencies Status](https://david-dm.org/ArnaudBuchholz/ui5-test-runner/dev-status.svg)](https://david-dm.org/ArnaudBuchholz/ui5-test-runner?type=dev)
 [![ui5-test-runner](https://badge.fury.io/js/ui5-test-runner.svg)](https://www.npmjs.org/package/ui5-test-runner)
 [![MIT License](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FArnaudBuchholz%2Fui5-test-runner.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2FArnaudBuchholz%2Fui5-test-runner?ref=badge_shield)
@@ -129,6 +127,7 @@ You may also use :
 | libs | | Folder(s) containing dependent libraries *(relative to `cwd`)*.<br/>Might be used multiple times, two syntaxes are supported :<ul><li>`-libs:path` adds `path` to the list of libraries, mapped directly under `/resources/`</li><li>`-libs:rel/=path` adds the `path` to the list of libraries, mapped under `/resources/rel/`</li></ul> |
 | cache | `''` | Cache UI5 resources locally in the given folder *(empty to disable)* |
 | webapp | `'webapp'` | base folder of the web application *(relative to `cwd`)* |
+| testsuite | `'test/testsuite.qunit.html'` | path / URL to the testsuite file *(relative to `webapp`)* |
 | pageFilter | `''` | [regexp](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp) to select which pages to execute |
 | pageParams | `''` | Parameters added to each page URL.<br/>For instance : `'sap-ui-theme=sap_belize&sap-ui-debug=true'` |
 | pageTimeout | `0` | Limit the page execution time (ms), fails the page if it takes longer than the timeout (`0` to disable the timeout) |

package/index.js

@@ -69,4 +69,4 @@ async function main () {
     })
 }
 
-main()
+main().catch(reason => output.genericError(reason))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui5-test-runner",
-  "version": "1.1.1",
+  "version": "1.1.4",
   "description": "Standalone test runner for UI5",
   "main": "index.js",
   "files": [
@@ -39,14 +39,14 @@
   },
   "homepage": "https://github.com/ArnaudBuchholz/ui5-test-runner#readme",
   "dependencies": {
-    "mime": "^2.5.2",
+    "mime": "^3.0.0",
     "nyc": "^15.1.0",
-    "puppeteer": "^10.4.0",
-    "reserve": "^1.11.7"
+    "puppeteer": "^13.5.2",
+    "reserve": "^1.14.0"
   },
   "devDependencies": {
-    "jest": "^27.3.1",
-    "nock": "^13.1.4",
+    "jest": "^27.5.1",
+    "nock": "^13.2.4",
     "standard": "^16.0.4"
   },
   "standard": {
@@ -58,6 +58,9 @@
     ]
   },
   "jest": {
+    "setupFilesAfterEnv": [
+      "./__mocks__/setup.js"
+    ],
     "collectCoverage": true,
     "collectCoverageFrom": [
       "src/*.js"

package/src/coverage.js

@@ -44,6 +44,15 @@ async function instrument (job) {
   await createDir(join(job.covTempDir, 'settings'))
   const settings = JSON.parse((await readFile(job.covSettings)).toString())
   settings.cwd = job.cwd
+  if (!settings.exclude) {
+    settings.exclude = []
+  }
+  settings.exclude.push(join(job.covTempDir, '**'))
+  if (job.cache) {
+    settings.exclude.push(join(job.cache, '**'))
+  }
+  settings.exclude.push(join(job.tstReportDir, '**'))
+  settings.exclude.push(join(job.covReportDir, '**'))
   await writeFile(job.nycSettingsPath, JSON.stringify(settings))
   await nyc('instrument', job.webapp, join(job.covTempDir, 'instrumented'), '--nycrc-path', job.nycSettingsPath)
 }

package/src/endpoints.js

@@ -38,6 +38,17 @@ module.exports = job => {
     }
   }
 
+  function getPageTest (page, testId) {
+    const { tests, order } = page
+    if (!tests[testId]) {
+      tests[testId] = {
+        timestamps: []
+      }
+      order.push(testId)
+    }
+    return tests[testId]
+  }
+
   return job.parallel
     ? [{
       // Substitute qunit-redirect to extract test pages
@@ -105,34 +116,27 @@ module.exports = job => {
       // Endpoint to receive QUnit.begin
         match: '^/_/QUnit/begin',
         custom: endpoint((url, details) => {
-          const tests = {}
-          const order = []
-          details.modules.forEach(module => {
-            module.tests.forEach(test => {
-              tests[test.testId] = {
-                ...test,
-                timestamps: []
-              }
-              order.push(test.testId)
-            })
-          })
-          job.testPages[url] = {
+          const page = {
             isOpa: details.isOpa,
             total: details.totalTests,
             failed: 0,
             passed: 0,
-            tests,
-            order
+            tests: {},
+            order: []
           }
+          details.modules.forEach(module => {
+            module.tests.forEach(test => getPageTest(page, test.testId))
+          })
+          job.testPages[url] = page
         })
       }, {
-      // Endpoint to receive QUnit.testDone
+      // Endpoint to receive QUnit.log
         match: '^/_/QUnit/log',
         custom: synchronousEndpoint(async (url, report) => {
           const page = job.testPages[url]
           if (page.isOpa) {
             const { testId, runtime } = report
-            page.tests[testId].timestamps.push(runtime)
+            getPageTest(page, testId).timestamps.push(runtime)
             await screenshot(job, url, `${testId}-${runtime}.png`)
           }
         })
@@ -149,7 +153,7 @@ module.exports = job => {
           } else {
             ++page.passed
           }
-          page.tests[testId].report = report
+          getPageTest(page, testId).report = report
         })
       }, {
       // Endpoint to receive QUnit.done

package/src/job.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { accessSync } = require('fs')
 const { join, isAbsolute } = require('path')
 const output = require('./output')
 
@@ -12,6 +13,7 @@ function allocate (cwd) {
     libs: [],
     cache: '',
     webapp: 'webapp',
+    testsuite: 'test/testsuite.qunit.html',
     pageFilter: '',
     pageParams: '',
     pageTimeout: 0,
@@ -37,6 +39,14 @@ function allocate (cwd) {
   }
 }
 
+function checkAccess (path, label) {
+  try {
+    accessSync(path)
+  } catch (error) {
+    throw new Error(`Unable to access ${label}, check your settings`)
+  }
+}
+
 function finalize (job) {
   Object.keys(job)
     .filter(name => name.startsWith('!'))
@@ -57,9 +67,15 @@ function finalize (job) {
   'webapp,browser,tstReportDir,covSettings,covTempDir,covReportDir'
     .split(',')
     .forEach(setting => updateToAbsolute(setting))
+  checkAccess(job.webapp, 'webapp folder')
+  checkAccess(job.browser, 'browser command')
+
+  const testsuitePath = toAbsolute(job.testsuite, job.webapp)
+  checkAccess(testsuitePath, 'testsuite')
 
   job.libs.forEach(libMapping => {
     libMapping.source = toAbsolute(libMapping.source)
+    checkAccess(libMapping.source, `lib mapping of ${libMapping.relative}`)
   })
 
   if (job.parallel <= 0) {

package/src/output.js

@@ -188,7 +188,7 @@ module.exports = {
     console.error(`Unable to cache '${path}' (status ${statusCode})`)
   },
   genericError (error) {
-    console.error('An unexpected error occurred', error)
+    console.error('An unexpected error occurred :', error.message || error)
   },
   unhandled () {
     console.warn('Some requests are not handled properly, check the unhandled.txt report for more info')

package/src/tests.js

@@ -26,7 +26,7 @@ async function extractTestPages (job) {
   await saveJob(job)
   job.status = 'Extracting test pages'
   job.testPageUrls = []
-  await start(job, '/test/testsuite.qunit.html')
+  await start(job, '/' + job.testsuite)
   if (job.testPageUrls.length === 0) {
     output.noTestPageFound()
     job.failed = true