@playwright/test 1.35.0-alpha-may-31-2023 → 1.35.0-alpha-jun-2-2023

package/lib/matchers/expect.js

@@ -169,7 +169,7 @@ class ExpectMetaInfoProxyHandler {
       const argsSuffix = computeArgsSuffix(matcherName, args);
       const defaultTitle = `expect${this._info.isPoll ? '.poll' : ''}${this._info.isSoft ? '.soft' : ''}${this._info.isNot ? '.not' : ''}.${matcherName}${argsSuffix}`;
       const wallTime = Date.now();
-      const step = testInfo._addStep({
+      const step = matcherName !== 'toPass' ? testInfo._addStep({
         location: stackFrames[0],
         category: 'expect',
         title: (0, _util.trimLongString)(customMessage || defaultTitle, 1024),
@@ -177,7 +177,7 @@ class ExpectMetaInfoProxyHandler {
           expected: args[0]
         } : undefined,
         wallTime
-      });
+      }) : undefined;
       const reportStepError = jestError => {
         const message = jestError.message;
         if (customMessage) {
@@ -196,13 +196,13 @@ class ExpectMetaInfoProxyHandler {
         const serializedError = (0, _util.serializeError)(jestError);
         // Serialized error has filtered stack trace.
         jestError.stack = serializedError.stack;
-        step.complete({
+        step === null || step === void 0 ? void 0 : step.complete({
           error: serializedError
         });
         if (this._info.isSoft) testInfo._failWithError(serializedError, false /* isHardError */);else throw jestError;
       };
       const finalizer = () => {
-        step.complete({});
+        step === null || step === void 0 ? void 0 : step.complete({});
       };
 
       // Process the async matchers separately to preserve the zones in the stacks.

package/lib/matchers/matchers.js

@@ -335,34 +335,52 @@ async function toBeOK(response) {
 async function toPass(callback, options = {}) {
   const testInfo = (0, _globals.currentTestInfo)();
   const timeout = options.timeout !== undefined ? options.timeout : 0;
-  const result = await (0, _utils.pollAgainstTimeout)(async () => {
-    if (testInfo && (0, _globals.currentTestInfo)() !== testInfo) return {
-      continuePolling: false,
-      result: undefined
-    };
-    try {
-      await callback();
-      return {
-        continuePolling: this.isNot,
+  const rawStack = (0, _utils.captureRawStack)();
+  const stackFrames = (0, _util.filteredStackTrace)(rawStack);
+  const runWithOrWithoutStep = async callback => {
+    if (!testInfo) return await callback(undefined);
+    return await testInfo._runAsStep({
+      title: 'expect.toPass',
+      category: 'expect',
+      location: stackFrames[0],
+      insulateChildErrors: true
+    }, callback);
+  };
+  return await runWithOrWithoutStep(async step => {
+    const result = await (0, _utils.pollAgainstTimeout)(async () => {
+      if (testInfo && (0, _globals.currentTestInfo)() !== testInfo) return {
+        continuePolling: false,
         result: undefined
       };
-    } catch (e) {
+      try {
+        await callback();
+        return {
+          continuePolling: this.isNot,
+          result: undefined
+        };
+      } catch (e) {
+        return {
+          continuePolling: !this.isNot,
+          result: e
+        };
+      }
+    }, timeout, options.intervals || [100, 250, 500, 1000]);
+    if (result.timedOut) {
+      const timeoutMessage = `Timeout ${timeout}ms exceeded while waiting on the predicate`;
+      const message = result.result ? [result.result.message, '', `Call Log:`, `- ${timeoutMessage}`].join('\n') : timeoutMessage;
+      step === null || step === void 0 ? void 0 : step.complete({
+        error: {
+          message
+        }
+      });
       return {
-        continuePolling: !this.isNot,
-        result: e
+        message: () => message,
+        pass: this.isNot
       };
     }
-  }, timeout, options.intervals || [100, 250, 500, 1000]);
-  if (result.timedOut) {
-    const timeoutMessage = `Timeout ${timeout}ms exceeded while waiting on the predicate`;
-    const message = () => result.result ? [result.result.message, '', `Call Log:`, `- ${timeoutMessage}`].join('\n') : timeoutMessage;
     return {
-      message,
-      pass: this.isNot
+      pass: !this.isNot,
+      message: () => ''
     };
-  }
-  return {
-    pass: !this.isNot,
-    message: () => ''
-  };
+  });
 }

package/lib/runner/uiMode.js

@@ -159,7 +159,9 @@ class UIMode {
   }
   _dispatchEvent(message) {
     // eslint-disable-next-line no-console
-    this._page.mainFrame().evaluateExpression(dispatchFuncSource, true, message).catch(e => this._originalStderrWrite.call(process.stderr, String(e)));
+    this._page.mainFrame().evaluateExpression(dispatchFuncSource, {
+      isFunction: true
+    }, message).catch(e => this._originalStderrWrite.call(process.stderr, String(e)));
   }
   async _listTests() {
     const listReporter = new _teleEmitter.TeleReporterEmitter(e => this._dispatchEvent(e));

package/lib/worker/testInfo.js

@@ -198,7 +198,7 @@ class TestInfoImpl {
         } else if (result.error) {
           // Internal API step reported an error.
           error = result.error;
-        } else {
+        } else if (!data.insulateChildErrors) {
           // One of the child steps failed (probably soft expect).
           // Report this step as failed to make it easier to spot.
           error = step.steps.map(s => s.error).find(e => !!e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@playwright/test",
-  "version": "1.35.0-alpha-may-31-2023",
+  "version": "1.35.0-alpha-jun-2-2023",
   "description": "A high-level API to automate web browsers",
   "repository": "github:Microsoft/playwright",
   "homepage": "https://playwright.dev",
@@ -41,7 +41,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@types/node": "*",
-    "playwright-core": "1.35.0-alpha-may-31-2023"
+    "playwright-core": "1.35.0-alpha-jun-2-2023"
   },
   "optionalDependencies": {
     "fsevents": "2.3.2"