wip: fix fallback API

wix-incubator · Sep 29, 2023 · c3e9c60 · c3e9c60
1 parent e8e57e0
commit c3e9c60
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/packages/library/src/jest-reporter/AssociateMetadata.ts b/packages/library/src/jest-reporter/AssociateMetadata.ts
@@ -15,6 +15,10 @@ export class AssociateMetadata {
       throw new JestMetadataError('Cannot associate metadata with an empty file path');
     }
 
+    if (!metadata) {
+      throw new JestMetadataError(`Cannot associate a non-existent metadata with a file: ${value}`);
+    }
+
     this._map.set(value, metadata);
 
     if (path.isAbsolute(value)) {
@@ -24,13 +28,15 @@ export class AssociateMetadata {
     }
   }
 
-  testCaseName(nameIdentifier: string[], metadata: TestEntryMetadata): void {
-    this._map.set(nameIdentifier.join('\u001F'), metadata);
-  }
-
   testCaseResult(testCaseResult: TestCaseResult, metadata: TestEntryMetadata): void {
-    if (testCaseResult == undefined) {
-      throw new JestMetadataError('Cannot associate metadata with an undefined test case result');
+    if (!testCaseResult) {
+      throw new JestMetadataError('Cannot associate metadata with a non-existent test case');
+    }
+
+    if (!metadata) {
+      throw new JestMetadataError(
+        `Cannot associate a non-existent metadata with a test case: ${testCaseResult.fullName}`,
+      );
     }
 
     this._map.set(testCaseResult, metadata);

diff --git a/packages/library/src/jest-reporter/FallbackAPI.ts b/packages/library/src/jest-reporter/FallbackAPI.ts
@@ -122,13 +122,14 @@ export class FallbackAPI {
       return [...rootDescribeBlock.allTestEntries()];
     }
 
+    for (const rotator of this._cache.values()) {
+      rotator.reset();
+    }
+
     for (const testCaseResult of testResults) {
       const nameId = this._getNameIdentifier(testFilePath, testCaseResult);
       const tests = this._cache.get(nameId);
-      const info = tests
-        ?.reset()
-        .items.reverse()
-        .find((t) => t.testCaseResult.status === testCaseResult.status);
+      const info = tests?.find((t) => t.testCaseResult.status === testCaseResult.status);
 
       if (!info) {
         const testId = `test_${rootDescribeBlock.children.length}`;

diff --git a/packages/library/src/metadata/containers/DescribeBlockMetadata.ts b/packages/library/src/metadata/containers/DescribeBlockMetadata.ts
@@ -57,6 +57,7 @@ export class DescribeBlockMetadata extends BaseMetadata {
 
     this.children.push(testEntry);
     this.file[symbols.currentMetadata] = testEntry;
+    this.file[symbols.lastTestEntry] = testEntry;
 
     return testEntry;
   }

diff --git a/packages/library/src/metadata/containers/TestFileMetadata.ts b/packages/library/src/metadata/containers/TestFileMetadata.ts
@@ -49,6 +49,7 @@ export class TestFileMetadata extends BaseMetadata {
 
   [symbols.start](): void {
     this[symbols.currentMetadata] = this;
+    this[symbols.lastTestEntry] = undefined;
   }
 
   [symbols.finish](): void {