timeout vs timedOut

Author: dgozman

packages/playwright/src/matchers/matcherHint.ts

@@ -29,6 +29,7 @@ type MatcherMessageDetails = {
   printedExpected?: string;
   printedReceived?: string;
   printedDiff?: string;
+  timedOut?: boolean;
   timeout?: number;
   errorMessage?: string;
   log?: string[];
@@ -59,7 +60,7 @@ export function formatMatcherMessage(state: ExpectMatcherState, details: Matcher
     message += details.printedExpected + '\n';
   if (details.printedReceived)
     message += details.printedReceived + '\n';
-  if (details.timeout)
+  if (details.timedOut && details.timeout)
     message += `Timeout: ${align ? ' ' : ''}${details.timeout}ms\n`;
   if (details.printedDiff)
     message += details.printedDiff + '\n';

packages/playwright/src/matchers/toBeTruthy.ts

@@ -61,7 +61,8 @@ export async function toBeTruthy(
       matcherName,
       expectation: arg,
       locator,
-      timeout: timedOut ? timeout : undefined,
+      timeout,
+      timedOut,
       printedExpected,
       printedReceived,
       errorMessage,

packages/playwright/src/matchers/toEqual.ts

@@ -89,7 +89,8 @@ export async function toEqual<T>(
       matcherName,
       expectation: 'expected',
       locator,
-      timeout: timedOut ? timeout : undefined,
+      timeout,
+      timedOut,
       printedExpected,
       printedReceived,
       printedDiff,

packages/playwright/src/matchers/toHaveURL.ts

@@ -90,7 +90,7 @@ function toHaveURLMessage(
   expected: Function,
   received: string | undefined,
   pass: boolean,
-  didTimeout: boolean,
+  timedOut: boolean,
   timeout: number,
 ): string {
   const receivedString = received || '';
@@ -115,7 +115,8 @@ function toHaveURLMessage(
   return formatMatcherMessage(state, {
     matcherName,
     expectation: 'expected',
-    timeout: didTimeout ? timeout : undefined,
+    timeout,
+    timedOut,
     printedExpected,
     printedReceived,
     printedDiff,

packages/playwright/src/matchers/toMatchAriaSnapshot.ts

@@ -104,7 +104,8 @@ export async function toMatchAriaSnapshot(
       matcherName,
       expectation: 'expected',
       locator,
-      timeout: timedOut ? timeout : undefined,
+      timeout,
+      timedOut,
       printedExpected,
       printedReceived,
       printedDiff,

packages/playwright/src/matchers/toMatchSnapshot.ts

@@ -381,7 +381,7 @@ export async function toHaveScreenshot(
     // We tried re-generating new snapshot but failed.
     // This can be due to e.g. spinning animation, so we want to show it as a diff.
     if (errorMessage) {
-      const header = formatMatcherMessage(this, { matcherName: 'toHaveScreenshot', locator, expectation: 'expected', timeout: timedOut ? timeout : undefined });
+      const header = formatMatcherMessage(this, { matcherName: 'toHaveScreenshot', locator, expectation: 'expected', timeout, timedOut });
       return helper.handleDifferent(actual, undefined, previous, diff, header, errorMessage, log, this._stepInfo);
     }
 
@@ -416,12 +416,12 @@ export async function toHaveScreenshot(
   if (helper.updateSnapshots === 'changed' || helper.updateSnapshots === 'all') {
     if (actual)
       return writeFiles(actual);
-    let header = formatMatcherMessage(this, { matcherName: 'toHaveScreenshot', locator, expectation: 'expected', timeout: timedOut ? timeout : undefined });
+    let header = formatMatcherMessage(this, { matcherName: 'toHaveScreenshot', locator, expectation: 'expected', timeout, timedOut });
     header += '  Failed to re-generate expected.\n';
     return helper.handleDifferent(actual, expectScreenshotOptions.expected, previous, diff, header, errorMessage, log, this._stepInfo);
   }
 
-  const header = formatMatcherMessage(this, { matcherName: 'toHaveScreenshot', locator, expectation: 'expected', timeout: timedOut ? timeout : undefined });
+  const header = formatMatcherMessage(this, { matcherName: 'toHaveScreenshot', locator, expectation: 'expected', timeout, timedOut });
   return helper.handleDifferent(actual, expectScreenshotOptions.expected, previous, diff, header, errorMessage, log, this._stepInfo);
 }
 

packages/playwright/src/matchers/toMatchText.ts

@@ -93,7 +93,8 @@ export async function toMatchText(
       matcherName,
       expectation: 'expected',
       locator,
-      timeout: timedOut ? timeout : undefined,
+      timeout,
+      timedOut,
       printedExpected,
       printedReceived,
       printedDiff,