fix(reporter): update calls to match new API in istanbul-lib-report fix

#398 (#403) BREAKING CHANGES: major dependencies are updated
karma-runner · Mar 24, 2020 · 4962a70 · 4962a70
1 parent fc6e289
commit 4962a70
Show file tree

Hide file tree

Showing 5 changed files with 278 additions and 139 deletions.
diff --git a/lib/in-memory-report.js b/lib/in-memory-report.js
@@ -1,5 +1,8 @@
-class InMemoryReport {
+const { ReportBase } = require('istanbul-lib-report')
+
+class InMemoryReport extends ReportBase {
   constructor (opt) {
+    super(opt)
     this.opt = opt
   }
 

diff --git a/lib/reporter.js b/lib/reporter.js
@@ -218,11 +218,11 @@ var CoverageReporter = function (rootConfig, helper, logger, emitter) {
     coverageMap.merge(result.coverage)
   }
 
-  this.onRunComplete = function (browsers, results) {
+  this.onRunComplete = async function (browsers, results) {
     const checkedCoverage = {}
 
     for (const reporterConfig of reporters) {
-      browsers.forEach(function (browser) {
+      await Promise.all(browsers.map(async (browser) => {
         const coverageMap = coverageMaps[browser.id]
         if (!coverageMap) {
           return
@@ -231,14 +231,15 @@ var CoverageReporter = function (rootConfig, helper, logger, emitter) {
         const mainDir = reporterConfig.dir || config.dir
         const subDir = reporterConfig.subdir || config.subdir
         const outputPath = generateOutputPath(basePath, browser.name, mainDir, subDir)
+        const remappedCoverageMap = await sourceMapStore.transformCoverage(coverageMap)
 
         const options = helper.merge(config, reporterConfig, {
           dir: outputPath,
           subdir: '',
           browser: browser,
-          emitter: emitter
+          emitter: emitter,
+          coverageMap: remappedCoverageMap
         })
-        const remappedCoverageMap = sourceMapStore.transformCoverage(coverageMap).map
 
         // If config.check is defined, check coverage levels for each browser
         if (hasOwnProperty.call(config, 'check') && !checkedCoverage[browser.id]) {
@@ -250,22 +251,21 @@ var CoverageReporter = function (rootConfig, helper, logger, emitter) {
         }
 
         const context = istanbulLibReport.createContext(options)
-        const tree = istanbulLibReport.summarizers.pkg(remappedCoverageMap)
         const report = reports.create(reporterConfig.type || 'html', options)
 
         // // If reporting to console or in-memory skip directory creation
         const toDisk = !reporterConfig.type || !reporterConfig.type.match(/^(text|text-summary|in-memory)$/)
 
         if (!toDisk && reporterConfig.file === undefined) {
-          tree.visit(report, context)
+          report.execute(context)
           return
         }
 
         helper.mkdirIfNotExists(outputPath, function () {
           log.debug('Writing coverage to %s', outputPath)
-          tree.visit(report, context)
+          report.execute(context)
         })
-      })
+      }))
     }
   }