PRO-10170 fix: error with rendering tests with initial runHash

fix: catch errors from original `actualValue` in `expect`

Author: uid11

src/utils/events/registerEndTestRunEvent.ts

@@ -14,7 +14,7 @@ import {calculateTestRunStatus} from './calculateTestRunStatus';
 import {getTestRunEvent} from './getTestRunEvent';
 import {writeFullMocksIfNeeded} from './writeFullMocksIfNeeded';
 
-import type {EndTestRunEvent, FullTestRun, TestRun} from '../../types/internal';
+import type {EndTestRunEvent, FullTestRun, RunHash, TestRun} from '../../types/internal';
 
 /**
  * Registers end test run event (for report) after test closing.
@@ -74,7 +74,7 @@ export const registerEndTestRunEvent = async (endTestRunEvent: EndTestRunEvent):
   const {getMainTestRunParams, getTestRunHash} = getUserlandHooks();
 
   const mainParams = getMainTestRunParams(testRun);
-  const runHash = getTestRunHash(testRun);
+  const runHash = getTestRunHash(testRun).replaceAll('#', '') as RunHash;
 
   const fullTestRun: FullTestRun = {mainParams, runHash, ...testRun};
 

src/utils/expect/createExpectMethod.ts

@@ -92,7 +92,11 @@ export const createExpectMethod = (
       }
 
       return runAssertion(this.actualValue);
-    });
+    }).catch((error: Error) => ({
+      actualValue: this.actualValue,
+      description: this.description,
+      error,
+    }));
 
     return assertionPromise.then(({actualValue, additionalLogFields, error}) => {
       const logMessage = `Assert: ${this.description}`;

src/utils/report/client/chooseTestRun.ts

@@ -1,18 +1,11 @@
 import {assertValueIsDefined as clientAssertValueIsDefined} from './assertValueIsDefined';
-import {
-  renderApiStatistics as clientRenderApiStatistics,
-  renderTestRunDetails as clientRenderTestRunDetails,
-} from './render';
-
-import type {
-  ApiStatisticsReportHash,
-  ReportClientState,
-  RunHash,
-  SafeHtml,
-} from '../../../types/internal';
+import {maybeRenderApiStatistics as clientMaybeRenderApiStatistics} from './maybeRenderApiStatistics';
+import {renderTestRunDetails as clientRenderTestRunDetails} from './render';
+
+import type {ReportClientState, RunHash, SafeHtml} from '../../../types/internal';
 
 const assertValueIsDefined: typeof clientAssertValueIsDefined = clientAssertValueIsDefined;
-const renderApiStatistics = clientRenderApiStatistics;
+const maybeRenderApiStatistics = clientMaybeRenderApiStatistics;
 const renderTestRunDetails = clientRenderTestRunDetails;
 
 declare const reportClientState: ReportClientState;
@@ -35,7 +28,7 @@ export function chooseTestRun(runHash: RunHash): void {
     return;
   }
 
-  const previousHash = window.location.hash as RunHash;
+  const previousHash = window.location.hash.replaceAll('#', '') as RunHash;
 
   window.location.hash = runHash;
 
@@ -47,7 +40,10 @@ export function chooseTestRun(runHash: RunHash): void {
 
   const previousTestRunDetailsElement = e2edRightColumnContainer.firstElementChild as HTMLElement;
 
-  if (!(previousHash in testRunDetailsElementsByHash)) {
+  if (
+    !(previousHash in testRunDetailsElementsByHash) &&
+    !previousTestRunDetailsElement.classList.contains('test-details-empty')
+  ) {
     testRunDetailsElementsByHash[previousHash] = previousTestRunDetailsElement;
   }
 
@@ -61,30 +57,9 @@ export function chooseTestRun(runHash: RunHash): void {
     return;
   }
 
-  const pagesHash: ApiStatisticsReportHash = 'api-statistics-pages';
-  const requestsHash: ApiStatisticsReportHash = 'api-statistics-requests';
-  const resourcesHash: ApiStatisticsReportHash = 'api-statistics-resources';
-
-  let rightColumnHtml: SafeHtml | undefined;
-
-  const hash = String(runHash);
-
-  if (hash === pagesHash || hash === requestsHash || hash === resourcesHash) {
-    const {reportClientData} = reportClientState;
-
-    if (reportClientData === undefined) {
-      // eslint-disable-next-line no-console
-      console.error(
-        `Cannot find report client data in JSON report data (tried to click "${runHash}"). Probably JSON report data not yet completely loaded. Please try click again later`,
-      );
-
-      return;
-    }
-
-    const {apiStatistics} = reportClientData;
+  let rightColumnHtml: SafeHtml | undefined = maybeRenderApiStatistics(runHash);
 
-    rightColumnHtml = renderApiStatistics({apiStatistics, hash});
-  } else {
+  if (rightColumnHtml === undefined) {
     const {fullTestRuns} = reportClientState;
     const fullTestRun = fullTestRuns.find((testRun) => testRun.runHash === runHash);
 

src/utils/report/client/index.ts

@@ -15,12 +15,14 @@ export {clickOnTestRun} from './clickOnTestRun';
 /** @internal */
 export {createJsxRuntime} from './createJsxRuntime';
 /** @internal */
+export {initialScript} from './initialScript';
+/** @internal */
+export {maybeRenderApiStatistics} from './maybeRenderApiStatistics';
+/** @internal */
 export {onDomContentLoad} from './onDomContentLoad';
 /** @internal */
 export {onFirstJsonReportDataLoad} from './onFirstJsonReportDataLoad';
 /** @internal */
-export {initialScript} from './initialScript';
-/** @internal */
 export {parseMarkdownLinks} from './parseMarkdownLinks';
 /** @internal */
 export {readJsonReportData} from './readJsonReportData';

src/utils/report/client/maybeRenderApiStatistics.ts

@@ -0,0 +1,45 @@
+import {renderApiStatistics as clientRenderApiStatistics} from './render';
+
+import type {
+  ApiStatisticsReportHash,
+  ReportClientState,
+  RunHash,
+  SafeHtml,
+} from '../../../types/internal';
+
+const renderApiStatistics = clientRenderApiStatistics;
+
+declare const reportClientState: ReportClientState;
+
+/**
+ * Renders `ApiStatistics` by `runHash`, if this is a one of kind of `ApiStatistics` hash
+ * (pages, requests or resources).
+ * This base client function should not use scope variables (except other base functions).
+ * @internal
+ */
+export function maybeRenderApiStatistics(runHash: RunHash): SafeHtml | undefined {
+  const hash = String(runHash);
+
+  const pagesHash: ApiStatisticsReportHash = 'api-statistics-pages';
+  const requestsHash: ApiStatisticsReportHash = 'api-statistics-requests';
+  const resourcesHash: ApiStatisticsReportHash = 'api-statistics-resources';
+
+  if (hash !== pagesHash && hash !== requestsHash && hash !== resourcesHash) {
+    return;
+  }
+
+  const {reportClientData} = reportClientState;
+
+  if (reportClientData === undefined) {
+    // eslint-disable-next-line no-console
+    console.error(
+      `Cannot find report client data in JSON report data (tried to click "${hash}"). Probably JSON report data not yet completely loaded. Please try click again later`,
+    );
+
+    return;
+  }
+
+  const {apiStatistics} = reportClientData;
+
+  return renderApiStatistics({apiStatistics, hash});
+}