feat: report coverage

ph-fritsche · Dec 6, 2022 · f01079b · f01079b
1 parent 3f183ec
commit f01079b
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 29 deletions.
diff --git a/src/conductor/TestConductor.ts b/src/conductor/TestConductor.ts
@@ -68,11 +68,9 @@ export abstract class TestConductor extends Entity {
         run.state = 'running'
         this.reporterServer.reportStart(run, this.setupFiles, testFiles)
 
-        await Promise.all(testFiles.map(f => this.runTestSuite(runId, f.url, f.id, f.name)
-            .then(
-                () => this.reporterServer.reportComplete(run, f.id),
-                async e => this.reporterServer.reportError(run, f.id, e),
-            )
+        await Promise.all(testFiles
+            .map(f => this.runTestSuite(runId, f.url, f.id, f.name)
+            .catch(e => this.reporterServer.reportError(run, f.id, e))
         ))
 
         run.state = 'done'

diff --git a/src/reporter/ReporterMessage.ts b/src/reporter/ReporterMessage.ts
@@ -1,4 +1,5 @@
 import { TestGroup, TestResult, TestError } from '../test'
+import type { CoverageMapData } from 'istanbul-lib-coverage'
 
 export type ReporterMessageMap<
     TGroup extends TestGroup,
@@ -14,6 +15,11 @@ export type ReporterMessageMap<
         testId: string
         result: TResult
     }
+    complete: {
+        runId: string
+        groupId: string
+        coverage: CoverageMapData
+    }
     error: {
         runId: string
         groupId: string

diff --git a/src/reporter/ReporterServer.ts b/src/reporter/ReporterServer.ts
@@ -29,6 +29,7 @@ export type ReporterEventMap = {
     complete: {
         run: TestRun
         group: TestGroup
+        coverage: object
     }
     error: {
         run: TestRun
@@ -102,6 +103,12 @@ export class ReporterServer {
                                 group: run.groups.get(report.groupId),
                                 error: report.error,
                             })
+                        } else if ('coverage' in report) {
+                            this.emitter.dispatch('complete', {
+                                run,
+                                group: run.groups.get(report.groupId),
+                                coverage: report.coverage,
+                            })
                         }
                     } catch (e) {
                         reject(e)
@@ -157,15 +164,6 @@ export class ReporterServer {
         this.emitter.dispatch('error', {run, error, group})
     }
 
-    async reportComplete(
-        run: TestRun,
-        groupId: string,
-    ) {
-        const group = run.groups.get(groupId)
-
-        this.emitter.dispatch('complete', {run, group })
-    }
-
     async reportDone(
         run: TestRun
     ) {
@@ -221,20 +219,28 @@ function parseReport(t: string) {
         ReporterMessageMap<TestGroup, TestResult, TestError>[keyof ReporterMessageMap<TestGroup, TestResult, TestError>]
 }
 
+type BaseEntities = {
+    TestGroup: BaseEntities.TestGroup
+    Test: BaseEntities.Test
+    TestResult: BaseEntities.TestResult
+    TestError: BaseEntities.TestError
+}
+function isRevivedType<K extends keyof BaseEntities>(
+    value: object,
+    type: K,
+): value is BaseEntities[K] {
+    return '__T' in value && value['__T'] === type
+}
 function reviveReportProps(key: string, value: unknown) {
     if (typeof value === 'object') {
-        if (key === 'result') {
-            return new TestResult(value as BaseEntities.TestResult)
-        } else if (key === 'error') {
-            return new TestError(value as BaseEntities.TestError)
-        } else if (key === 'group') {
-            return new TestGroup(value as BaseEntities.TestGroup)
-        } else if (String(Number(key)) === key) {
-            if ('children' in value) {
-                return new TestGroup(value as BaseEntities.TestGroup)
-            } else {
-                return new Test(value as BaseEntities.Test)
-            }
+        if (isRevivedType(value, 'Test')) {
+            return new Test(value)
+        } else if (isRevivedType(value, 'TestGroup')) {
+            return new TestGroup(value)
+        } else if (isRevivedType(value, 'TestError')) {
+            return new TestError(value)
+        } else if (isRevivedType(value, 'TestResult')) {
+            return new TestResult(value)
         }
     }
     return value

diff --git a/src/runner/TestRunner.ts b/src/runner/TestRunner.ts
@@ -31,6 +31,12 @@ export class TestRunner {
                 result,
             })
         }
+
+        await this.report('complete', {
+            runId,
+            groupId: group.id,
+            coverage: globalThis.__coverage__,
+        })
     }
 
     protected async *execTestsIterator(

diff --git a/src/test/Test.ts b/src/test/Test.ts
@@ -29,6 +29,7 @@ export class Test extends Entity {
 
     toJSON() {
         return {
+            __T: 'Test',
             id: this.id,
             title: this.title,
         }

diff --git a/src/test/TestError.ts b/src/test/TestError.ts
@@ -10,6 +10,7 @@ export class TestError extends Error {
 
     toJSON() {
         return {
+            __T: 'TestError',
             name: this.name,
             message: this.message,
             stack: this.stack,

diff --git a/src/test/TestGroup.ts b/src/test/TestGroup.ts
@@ -30,6 +30,7 @@ export class TestGroup extends Entity {
 
     toJSON() {
         return {
+            __T: 'TestGroup',
             id: this.id,
             title: this.title,
             children: this._children,

diff --git a/src/test/TestResult.ts b/src/test/TestResult.ts
@@ -1,5 +1,3 @@
-import { Serializable } from "./types"
-
 export class TestResult {
     readonly duration?: number
     readonly error?: Error
@@ -13,8 +11,9 @@ export class TestResult {
         this.error = props.error
     }
 
-    toJSON(): Serializable<TestResult> {
+    toJSON() {
         return {
+            __T: 'TestResult',
             status: this.status,
             duration: this.duration,
             error: this.error && {