ui5-test-runner 4.0.0 → 4.1.0

package/src/qunit-hooks.js

@@ -17,12 +17,38 @@ function invalidTestId (job, url, testId) {
   error(job, url, `No QUnit unit test found with id ${testId}`)
 }
 
-function get (job, urlWithHash, testId) {
+function merge (targetModules, modules) {
+  let count = 0
+  modules.forEach(module => {
+    const { name } = module
+    const targetModule = targetModules.filter(({ name: targetName }) => name === targetName)[0]
+    if (targetModule === undefined) {
+      targetModules.push(module)
+    } else {
+      module.tests.forEach(test => {
+        const targetTest = targetModule.tests.filter(({ testId }) => test.testId === testId)[0]
+        if (!targetTest) {
+          targetModule.tests.push(test)
+        }
+      })
+    }
+    count += module.tests.length
+  })
+  return count
+}
+
+function get (job, urlWithHash, { testId, modules, isOpa } = {}) {
   const url = stripUrlHash(urlWithHash)
   const page = job.qunitPages && job.qunitPages[url]
   if (!page) {
     error(job, url, `No QUnit page found for ${urlWithHash}`)
   }
+  if (modules && modules.length) {
+    page.count = merge(page.modules, modules)
+  }
+  if (!page.isOpa && isOpa) {
+    page.isOpa = true
+  }
   let testModule
   let test
   if (testId !== undefined) {
@@ -35,7 +61,7 @@ function get (job, urlWithHash, testId) {
         return false
       }
     })
-    if (!test && job.qunitStrict) {
+    if (!test) {
       invalidTestId(job, url, testId)
     }
   }
@@ -44,7 +70,7 @@ function get (job, urlWithHash, testId) {
 
 async function done (job, urlWithHash, report) {
   const { url, page } = get(job, urlWithHash)
-  if (page.earlyStart && page.count === 0) {
+  if (page.count === 0) {
     return // wait
   }
   if (job.browserCapabilities.screenshot) {
@@ -66,15 +92,10 @@ async function done (job, urlWithHash, report) {
 module.exports = {
   get,
 
-  async begin (job, urlWithHash, { isOpa, totalTests, modules }) {
+  async begin (job, urlWithHash, details) {
+    getOutput(job).debug('qunit', 'begin', urlWithHash, details)
+    const { isOpa, totalTests, modules } = details
     const url = stripUrlHash(urlWithHash)
-    const earlyStart = !totalTests || !modules
-    if (earlyStart) {
-      getOutput(job).qunitEarlyStart(url)
-      if (job.qunitStrict) {
-        error(job, url, 'Invalid begin hook details')
-      }
-    }
     if (!job.qunitPages) {
       job.qunitPages = {}
     }
@@ -87,28 +108,19 @@ module.exports = {
       count: totalTests,
       modules
     }
-    if (earlyStart) {
-      qunitPage.earlyStart = true
-    }
     job.qunitPages[url] = qunitPage
   },
 
-  async testStart (job, urlWithHash, { module, name, testId }) {
-    let { page, testModule, test } = get(job, urlWithHash, testId)
-    if (!testModule) {
-      testModule = { name: module, tests: [] }
-      page.modules.push(testModule)
-    }
-    if (!test) {
-      test = { name, testId }
-      testModule.tests.push(test)
-      ++page.count
-    }
+  async testStart (job, urlWithHash, details) {
+    getOutput(job).debug('qunit', 'testStart', urlWithHash, details)
+    const { test } = get(job, urlWithHash, details)
     test.start = new Date()
   },
 
-  async log (job, urlWithHash, { module, name, testId, ...log }) {
-    const { url, page, test } = get(job, urlWithHash, testId)
+  async log (job, urlWithHash, details) {
+    getOutput(job).debug('qunit', 'log', urlWithHash, details)
+    const { url, page, test } = get(job, urlWithHash, details)
+    const { isOpa, modules, module, name, testId, ...log } = details
     if (!test) {
       invalidTestId(job, url, testId)
     }
@@ -126,9 +138,11 @@ module.exports = {
     }
   },
 
-  async testDone (job, urlWithHash, { name, module, testId, assertions, ...report }) {
+  async testDone (job, urlWithHash, details) {
+    getOutput(job).debug('qunit', 'testDone', urlWithHash, details)
+    const { name, module, testId, assertions, ...report } = details
     const { failed } = report
-    const { url, page, test } = get(job, urlWithHash, testId)
+    const { url, page, test } = get(job, urlWithHash, { testId })
     if (!test) {
       invalidTestId(job, url, testId)
     }

package/src/symbols.js

@@ -5,5 +5,6 @@ module.exports = {
   $testPagesStarted: Symbol('testPagesStarted'),
   $testPagesCompleted: Symbol('testPagesCompleted'),
   $valueSources: Symbol('valueSources'),
-  $remoteOnLegacy: Symbol('remoteOnLegacy')
+  $remoteOnLegacy: Symbol('remoteOnLegacy'),
+  $proxifiedUrls: Symbol('proxifiedUrls')
 }

package/src/tests.js

@@ -13,6 +13,7 @@ const {
   $testPagesCompleted
 } = require('./symbols')
 const { UTRError } = require('./error')
+const { $proxifiedUrls } = require('./symbols')
 
 async function run (task, job) {
   const {
@@ -70,7 +71,7 @@ async function runTestPage (job, url) {
   const output = getOutput(job)
   try {
     let scripts
-    if (job.mode === 'url' && job.browserCapabilities.scripts) {
+    if (job.browserCapabilities.scripts) {
       scripts = [
         'post.js',
         'qunit-intercept.js',
@@ -86,6 +87,10 @@ async function runTestPage (job, url) {
     if (job.coverageProxy) {
       const { origin } = new URL(url)
       const proxifiedUrl = url.replace(origin, `http://localhost:${job.port}`)
+      if (!job[$proxifiedUrls]) {
+        job[$proxifiedUrls] = {}
+      }
+      job[$proxifiedUrls][proxifiedUrl] = url
       await start(job, proxifiedUrl, scripts)
       job.qunitPages[url] = job.qunitPages[proxifiedUrl]
       delete job.qunitPages[proxifiedUrl]

package/src/add-test-pages.spec.js

@@ -1,95 +0,0 @@
-jest.mock('./browsers.js', () => ({
-  stop: jest.fn()
-}))
-const { stop } = require('./browsers')
-const { join } = require('path')
-const { createDir } = require('./tools')
-
-const {
-  addTestPages
-} = require('./add-test-pages')
-
-describe('src/add-test-pages', () => {
-  const url = 'http://localhost:8045/index.html'
-  const reportDir = join(__dirname, '../tmp/add-test-pages')
-  let job
-
-  beforeAll(() => createDir(reportDir))
-
-  beforeEach(() => {
-    stop.mockClear()
-    job = {
-      reportDir
-    }
-  })
-
-  describe('addTestPages', () => {
-    it('keeps track of added test pages and stops browser', async () => {
-      await addTestPages(job, url, [
-        '/page1.html',
-        'page2.html'
-      ])
-      expect(job.testPageUrls).toEqual([
-        'http://localhost:8045/page1.html',
-        'http://localhost:8045/page2.html'
-      ])
-      expect(stop).toHaveBeenCalledWith(job, url)
-    })
-
-    it('supports regexp filtering', async () => {
-      job.pageFilter = 'page(1|3)'
-      await addTestPages(job, url, [
-        '/page1.html',
-        'page2.html',
-        'page3.html'
-      ])
-      expect(job.testPageUrls).toEqual([
-        'http://localhost:8045/page1.html',
-        'http://localhost:8045/page3.html'
-      ])
-      expect(stop).toHaveBeenCalledWith(job, url)
-    })
-
-    it('supports parameters injection', async () => {
-      job.pageParams = 'a&b'
-      await addTestPages(job, url, [
-        '/page1.html',
-        'page2.html?test'
-      ])
-      expect(job.testPageUrls).toEqual([
-        'http://localhost:8045/page1.html?a&b',
-        'http://localhost:8045/page2.html?test&a&b'
-      ])
-      expect(stop).toHaveBeenCalledWith(job, url)
-    })
-
-    it('filters out duplicates', async () => {
-      await addTestPages(job, url, [
-        '/page1.html',
-        'page1.html'
-      ])
-      expect(job.testPageUrls).toEqual([
-        'http://localhost:8045/page1.html'
-      ])
-      expect(stop).toHaveBeenCalledWith(job, url)
-    })
-
-    it('supports multiple calls', async () => {
-      await addTestPages(job, url, ['/page1.html'])
-      await addTestPages(job, url, ['page1.html', '/page2.html'])
-      expect(job.testPageUrls).toEqual([
-        'http://localhost:8045/page1.html',
-        'http://localhost:8045/page2.html'
-      ])
-    })
-
-    it('supports absolute urls', async () => {
-      await addTestPages(job, url, ['/page1.html'])
-      await addTestPages(job, url, ['http://localhost:8045/page2.html'])
-      expect(job.testPageUrls).toEqual([
-        'http://localhost:8045/page1.html',
-        'http://localhost:8045/page2.html'
-      ])
-    })
-  })
-})