ui5-test-runner 2.0.2 → 2.0.4

package/package.json

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

package/src/browser.spec.js

@@ -142,7 +142,7 @@ describe('src/browser', () => {
         })
         await probe(job)
         expect(job.browserCapabilities.modules).toStrictEqual(['reserve', 'dependentModule'])
-        expect(job.browserModules.reserve).toStrictEqual(join(__dirname, '../node_modules/reserve'))
+        expect(job.browserModules.reserve).toStrictEqual('reserve')
         expect(job.browserModules.dependentModule).toStrictEqual(join(npmGlobal, 'dependentModule'))
       })
 

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

@@ -1,8 +1,10 @@
 'use strict'
 
+// Based on specification from llg[.]cubic[.]org/docs/junit/
+
 const { join } = require('path')
 const { writeFile } = require('fs').promises
-const [,, reportDir] = process.argv
+const [, , reportDir] = process.argv
 
 const output = []
 function o (text) {
@@ -38,12 +40,17 @@ async function main () {
         if (test.skip) {
           o('      <skipped></skipped>')
         } else if (test.report.failed) {
-          const log = test.logs.filter(({ result }) => !result)[0]
-          o(`      <failure
+          test.logs
+            .filter(({ result }) => !result)
+            .forEach(log => {
+              o(`      <failure
         message="${xmlEscape(log.message)}"
       >`)
-          o(xmlEscape(log.source))
-          o('      </failure>')
+              if (log.source) {
+                o(xmlEscape(log.source))
+              }
+              o('      </failure>')
+            })
         }
         o('    </testcase>')
       }

package/src/npm.js

@@ -1,6 +1,6 @@
 const { exec } = require('child_process')
 const { join } = require('path')
-const { stat, readFile } = require('fs/promises')
+const { stat } = require('fs/promises')
 const { UTRError } = require('./error')
 const { getOutput } = require('./output')
 
@@ -38,33 +38,40 @@ module.exports = {
   },
 
   async resolvePackage (job, name) {
-    if (!localRoot) {
-      [localRoot, globalRoot] = await Promise.all([
-        npm(job, 'root'),
-        npm(job, 'root', '--global')
-      ])
-    }
     let modulePath
     let justInstalled = false
-    const localPath = join(localRoot, name)
-    if (await folderExists(localPath)) {
-      modulePath = localPath
-    } else {
-      const globalPath = join(globalRoot, name)
-      if (!await folderExists(globalPath)) {
-        if (!job.npmInstall) {
-          throw UTRError.NPM_DEPENDENCY_NOT_FOUND(name)
+    try {
+      require(name)
+      modulePath = name
+    } catch (e) {
+    }
+    if (!modulePath) {
+      if (!localRoot) {
+        [localRoot, globalRoot] = await Promise.all([
+          npm(job, 'root'),
+          npm(job, 'root', '--global')
+        ])
+      }
+      const localPath = join(localRoot, name)
+      if (await folderExists(localPath)) {
+        modulePath = localPath
+      } else {
+        const globalPath = join(globalRoot, name)
+        if (!await folderExists(globalPath)) {
+          if (!job.npmInstall) {
+            throw UTRError.NPM_DEPENDENCY_NOT_FOUND(name)
+          }
+          const previousStatus = job.status
+          job.status = `Installing ${name}...`
+          await npm(job, 'install', name, '-g')
+          justInstalled = true
+          job.status = previousStatus
         }
-        const previousStatus = job.status
-        job.status = `Installing ${name}...`
-        await npm(job, 'install', name, '-g')
-        justInstalled = true
-        job.status = previousStatus
+        modulePath = globalPath
       }
-      modulePath = globalPath
     }
     const output = getOutput(job)
-    const installedPackage = JSON.parse((await readFile(join(modulePath, 'package.json'))).toString())
+    const installedPackage = require(join(modulePath, 'package.json'))
     const { version: installedVersion } = installedPackage
     output.resolvedPackage(name, modulePath, installedVersion)
     if (!justInstalled) {

package/src/npm.spec.js

@@ -40,7 +40,7 @@ describe('src/npm', () => {
 
   it('detects already installed local package', async () => {
     const path = await resolvePackage(job, 'reserve')
-    expect(path).toStrictEqual(join(__dirname, '../node_modules/reserve'))
+    expect(path).toStrictEqual('reserve')
     expect(output.resolvedPackage).toHaveBeenCalledTimes(1)
     expect(output.packageNotLatest).not.toHaveBeenCalled()
   })