@playwright/test 1.37.0-alpha-aug-3-2023 → 1.37.0-alpha-aug-5-2023

package/lib/isomorphic/stringInternPool.js

@@ -0,0 +1,36 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.StringInternPool = void 0;
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class StringInternPool {
+  constructor() {
+    this._stringCache = new Map();
+  }
+  internString(s) {
+    let result = this._stringCache.get(s);
+    if (!result) {
+      this._stringCache.set(s, s);
+      result = s;
+    }
+    return result;
+  }
+}
+exports.StringInternPool = StringInternPool;

package/lib/isomorphic/teleReceiver.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.baseFullConfig = exports.TeleTestCase = exports.TeleSuite = exports.TeleReporterReceiver = void 0;
 exports.parseRegexPatterns = parseRegexPatterns;
 exports.serializeRegexPatterns = serializeRegexPatterns;
+var _stringInternPool = require("./stringInternPool");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -34,6 +35,7 @@ class TeleReporterReceiver {
     this._reuseTestCases = void 0;
     this._reportConfig = void 0;
     this._config = void 0;
+    this._stringPool = new _stringInternPool.StringInternPool();
     this._rootSuite = new TeleSuite('', 'root');
     this._pathSeparator = pathSeparator;
     this._reporter = reporter;
@@ -129,7 +131,7 @@ class TeleReporterReceiver {
     testResult.retry = payload.retry;
     testResult.workerIndex = payload.workerIndex;
     testResult.parallelIndex = payload.parallelIndex;
-    testResult.startTime = new Date(payload.startTime);
+    testResult.setStartTimeNumber(payload.startTime);
     testResult.statusEx = 'running';
     (_this$_reporter$onTes = (_this$_reporter2 = this._reporter).onTestBegin) === null || _this$_reporter$onTes === void 0 ? void 0 : _this$_reporter$onTes.call(_this$_reporter2, test, testResult);
   }
@@ -147,25 +149,16 @@ class TeleReporterReceiver {
     result.error = (_result$errors = result.errors) === null || _result$errors === void 0 ? void 0 : _result$errors[0];
     result.attachments = this._parseAttachments(payload.attachments);
     (_this$_reporter$onTes2 = (_this$_reporter3 = this._reporter).onTestEnd) === null || _this$_reporter$onTes2 === void 0 ? void 0 : _this$_reporter$onTes2.call(_this$_reporter3, test, result);
+    // Free up the memory as won't see these step ids.
+    result.stepMap = new Map();
   }
   _onStepBegin(testId, resultId, payload) {
     var _this$_reporter$onSte, _this$_reporter4;
     const test = this._tests.get(testId);
     const result = test.resultsMap.get(resultId);
     const parentStep = payload.parentStepId ? result.stepMap.get(payload.parentStepId) : undefined;
-    const step = {
-      titlePath: () => {
-        const parentPath = (parentStep === null || parentStep === void 0 ? void 0 : parentStep.titlePath()) || [];
-        return [...parentPath, payload.title];
-      },
-      title: payload.title,
-      category: payload.category,
-      location: this._absoluteLocation(payload.location),
-      parent: parentStep,
-      startTime: new Date(payload.startTime),
-      duration: -1,
-      steps: []
-    };
+    const location = this._absoluteLocation(payload.location);
+    const step = new TeleTestStep(payload, parentStep, location);
     if (parentStep) parentStep.steps.push(step);else result.steps.push(step);
     result.stepMap.set(payload.id, step);
     (_this$_reporter$onSte = (_this$_reporter4 = this._reporter).onStepBegin) === null || _this$_reporter$onSte === void 0 ? void 0 : _this$_reporter$onSte.call(_this$_reporter4, test, result, step);
@@ -203,6 +196,8 @@ class TeleReporterReceiver {
   }
   _onExit() {
     var _this$_reporter$onExi, _this$_reporter10;
+    // Free up the memory from the string pool.
+    this._stringPool = new _stringInternPool.StringInternPool();
     return (_this$_reporter$onExi = (_this$_reporter10 = this._reporter).onExit) === null || _this$_reporter$onExi === void 0 ? void 0 : _this$_reporter$onExi.call(_this$_reporter10);
   }
   _parseConfig(config) {
@@ -288,7 +283,7 @@ class TeleReporterReceiver {
   }
   _absolutePath(relativePath) {
     if (!relativePath) return relativePath;
-    return this._rootDir + this._pathSeparator + relativePath;
+    return this._stringPool.internString(this._rootDir + this._pathSeparator + relativePath);
   }
 }
 exports.TeleReporterReceiver = TeleReporterReceiver;
@@ -368,27 +363,68 @@ class TeleTestCase {
     this.resultsMap.clear();
   }
   _createTestResult(id) {
-    const result = {
-      retry: this.results.length,
-      parallelIndex: -1,
-      workerIndex: -1,
-      duration: -1,
-      startTime: new Date(),
-      stdout: [],
-      stderr: [],
-      attachments: [],
-      status: 'skipped',
-      statusEx: 'scheduled',
-      steps: [],
-      errors: [],
-      stepMap: new Map()
-    };
+    const result = new TeleTestResult(this.results.length);
     this.results.push(result);
     this.resultsMap.set(id, result);
     return result;
   }
 }
 exports.TeleTestCase = TeleTestCase;
+class TeleTestStep {
+  constructor(payload, parentStep, location) {
+    this.title = void 0;
+    this.category = void 0;
+    this.location = void 0;
+    this.parent = void 0;
+    this.duration = -1;
+    this.steps = [];
+    this._startTime = 0;
+    this.title = payload.title;
+    this.category = payload.category;
+    this.location = location;
+    this.parent = parentStep;
+    this._startTime = payload.startTime;
+  }
+  titlePath() {
+    var _this$parent;
+    const parentPath = ((_this$parent = this.parent) === null || _this$parent === void 0 ? void 0 : _this$parent.titlePath()) || [];
+    return [...parentPath, this.title];
+  }
+  get startTime() {
+    return new Date(this._startTime);
+  }
+  set startTime(value) {
+    this._startTime = +value;
+  }
+}
+class TeleTestResult {
+  constructor(retry) {
+    this.retry = void 0;
+    this.parallelIndex = -1;
+    this.workerIndex = -1;
+    this.duration = -1;
+    this.stdout = [];
+    this.stderr = [];
+    this.attachments = [];
+    this.status = 'skipped';
+    this.steps = [];
+    this.errors = [];
+    this.error = void 0;
+    this.stepMap = new Map();
+    this.statusEx = 'scheduled';
+    this._startTime = 0;
+    this.retry = retry;
+  }
+  setStartTimeNumber(startTime) {
+    this._startTime = startTime;
+  }
+  get startTime() {
+    return new Date(this._startTime);
+  }
+  set startTime(value) {
+    this._startTime = +value;
+  }
+}
 const baseFullConfig = {
   forbidOnly: false,
   fullyParallel: false,

package/lib/matchers/toMatchSnapshot.js

@@ -76,7 +76,7 @@ class SnapshotHelper {
     let actualModifier = '';
     if (!name) {
       const fullTitleWithoutSpec = [...testInfo.titlePath.slice(1), ++snapshotNames.anonymousSnapshotIndex].join(' ');
-      name = (0, _util.sanitizeForFilePath)((0, _util.trimLongString)(fullTitleWithoutSpec)) + '.' + anonymousSnapshotExtension;
+      name = (0, _utils.sanitizeForFilePath)((0, _util.trimLongString)(fullTitleWithoutSpec)) + '.' + anonymousSnapshotExtension;
       this.snapshotName = name;
     } else {
       const joinedName = Array.isArray(name) ? name.join(_path.default.sep) : name;

package/lib/plugins/webServerPlugin.js

@@ -33,7 +33,7 @@ const DEFAULT_ENVIRONMENT_VARIABLES = {
 const debugWebServer = (0, _utilsBundle.debug)('pw:webserver');
 class WebServerPlugin {
   constructor(options, checkPortOnly) {
-    this._isAvailable = void 0;
+    this._isAvailableCallback = void 0;
     this._killProcess = void 0;
     this._processExitedPromise = void 0;
     this._options = void 0;
@@ -46,7 +46,7 @@ class WebServerPlugin {
   async setup(config, configDir, reporter) {
     var _this$_reporter$onStd;
     this._reporter = reporter;
-    this._isAvailable = getIsAvailableFunction(this._options.url, this._checkPortOnly, !!this._options.ignoreHTTPSErrors, (_this$_reporter$onStd = this._reporter.onStdErr) === null || _this$_reporter$onStd === void 0 ? void 0 : _this$_reporter$onStd.bind(this._reporter));
+    this._isAvailableCallback = this._options.url ? getIsAvailableFunction(this._options.url, this._checkPortOnly, !!this._options.ignoreHTTPSErrors, (_this$_reporter$onStd = this._reporter.onStdErr) === null || _this$_reporter$onStd === void 0 ? void 0 : _this$_reporter$onStd.bind(this._reporter)) : undefined;
     this._options.cwd = this._options.cwd ? _path.default.resolve(configDir, this._options.cwd) : configDir;
     try {
       await this._startProcess();
@@ -61,14 +61,15 @@ class WebServerPlugin {
     await ((_this$_killProcess = this._killProcess) === null || _this$_killProcess === void 0 ? void 0 : _this$_killProcess.call(this));
   }
   async _startProcess() {
+    var _this$_isAvailableCal;
     let processExitedReject = error => {};
     this._processExitedPromise = new Promise((_, reject) => processExitedReject = reject);
-    const isAlreadyAvailable = await this._isAvailable();
+    const isAlreadyAvailable = await ((_this$_isAvailableCal = this._isAvailableCallback) === null || _this$_isAvailableCal === void 0 ? void 0 : _this$_isAvailableCal.call(this));
     if (isAlreadyAvailable) {
       var _this$_options$url;
       debugWebServer(`WebServer is already available`);
       if (this._options.reuseExistingServer) return;
-      const port = new URL(this._options.url);
+      const port = new URL(this._options.url).port;
       throw new Error(`${(_this$_options$url = this._options.url) !== null && _this$_options$url !== void 0 ? _this$_options$url : `http://localhost${port ? ':' + port : ''}`} is already used, make sure that nothing is running on the port/url or set reuseExistingServer:true in config.webServer.`);
     }
     debugWebServer(`Starting WebServer process ${this._options.command}...`);
@@ -104,20 +105,21 @@ class WebServerPlugin {
     });
   }
   async _waitForProcess() {
+    if (!this._isAvailableCallback) {
+      this._processExitedPromise.catch(() => {});
+      return;
+    }
     debugWebServer(`Waiting for availability...`);
-    await this._waitForAvailability();
-    debugWebServer(`WebServer available`);
-  }
-  async _waitForAvailability() {
     const launchTimeout = this._options.timeout || 60 * 1000;
     const cancellationToken = {
       canceled: false
     };
     const {
       timedOut
-    } = await Promise.race([(0, _utils.raceAgainstDeadline)(() => waitFor(this._isAvailable, cancellationToken), (0, _utils.monotonicTime)() + launchTimeout), this._processExitedPromise]);
+    } = await Promise.race([(0, _utils.raceAgainstDeadline)(() => waitFor(this._isAvailableCallback, cancellationToken), (0, _utils.monotonicTime)() + launchTimeout), this._processExitedPromise]);
     cancellationToken.canceled = true;
     if (timedOut) throw new Error(`Timed out waiting ${launchTimeout}ms from config.webServer.`);
+    debugWebServer(`WebServer available`);
   }
 }
 exports.WebServerPlugin = WebServerPlugin;
@@ -188,11 +190,14 @@ const webServerPluginsForConfig = config => {
   const shouldSetBaseUrl = !!config.config.webServer;
   const webServerPlugins = [];
   for (const webServerConfig of config.webServers) {
-    if (!webServerConfig.port && !webServerConfig.url || webServerConfig.port && webServerConfig.url) throw new Error(`Exactly one of 'port' or 'url' is required in config.webServer.`);
-    const url = webServerConfig.url || `http://localhost:${webServerConfig.port}`;
+    if (webServerConfig.port && webServerConfig.url) throw new Error(`Either 'port' or 'url' should be specified in config.webServer.`);
+    let url;
+    if (webServerConfig.port || webServerConfig.url) {
+      url = webServerConfig.url || `http://localhost:${webServerConfig.port}`;
 
-    // We only set base url when only the port is given. That's a legacy mode we have regrets about.
-    if (shouldSetBaseUrl && !webServerConfig.url) process.env.PLAYWRIGHT_TEST_BASE_URL = url;
+      // We only set base url when only the port is given. That's a legacy mode we have regrets about.
+      if (shouldSetBaseUrl && !webServerConfig.url) process.env.PLAYWRIGHT_TEST_BASE_URL = url;
+    }
     webServerPlugins.push(new WebServerPlugin({
       ...webServerConfig,
       url

package/lib/reporters/blob.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.BlobReporter = void 0;
+exports.currentBlobReportVersion = exports.BlobReporter = void 0;
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
 var _utils = require("playwright-core/lib/utils");
@@ -29,7 +29,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * limitations under the License.
  */
 
-const currentVersion = 1;
+const currentBlobReportVersion = 1;
+exports.currentBlobReportVersion = currentBlobReportVersion;
 class BlobReporter extends _teleEmitter.TeleReporterEmitter {
   constructor(options) {
     super(message => this._messages.push(message), false);
@@ -37,13 +38,14 @@ class BlobReporter extends _teleEmitter.TeleReporterEmitter {
     this._attachments = [];
     this._options = void 0;
     this._salt = void 0;
+    this._reportName = void 0;
     this._options = options;
     this._salt = (0, _utils.createGuid)();
   }
   onConfigure(config) {
     var _config$shard;
     const metadata = {
-      version: currentVersion,
+      version: currentBlobReportVersion,
       projectSuffix: process.env.PWTEST_BLOB_SUFFIX,
       shard: (_config$shard = config.shard) !== null && _config$shard !== void 0 ? _config$shard : undefined
     };
@@ -51,6 +53,7 @@ class BlobReporter extends _teleEmitter.TeleReporterEmitter {
       method: 'onBlobReportMetadata',
       params: metadata
     });
+    this._reportName = this._computeReportName(config);
     super.onConfigure(config);
   }
   async onEnd(result) {
@@ -60,14 +63,13 @@ class BlobReporter extends _teleEmitter.TeleReporterEmitter {
     await _fs.default.promises.mkdir(outputDir, {
       recursive: true
     });
-    const reportName = `report-${(0, _utils.createGuid)()}`;
     const zipFile = new _zipBundle.yazl.ZipFile();
     const zipFinishPromise = new _utils.ManualPromise();
     const finishPromise = zipFinishPromise.catch(e => {
-      throw new Error(`Failed to write report ${reportName + '.zip'}: ` + e.message);
+      throw new Error(`Failed to write report ${this._reportName + '.zip'}: ` + e.message);
     });
     zipFile.on('error', error => zipFinishPromise.reject(error));
-    const zipFileName = _path.default.join(outputDir, reportName + '.zip');
+    const zipFileName = _path.default.join(outputDir, this._reportName + '.zip');
     zipFile.outputStream.pipe(_fs.default.createWriteStream(zipFileName)).on('close', () => {
       zipFinishPromise.resolve(undefined);
     }).on('error', error => zipFinishPromise.reject(error));
@@ -83,10 +85,19 @@ class BlobReporter extends _teleEmitter.TeleReporterEmitter {
     }
     const lines = this._messages.map(m => JSON.stringify(m) + '\n');
     const content = _stream.Readable.from(lines);
-    zipFile.addReadStream(content, reportName + '.jsonl');
+    zipFile.addReadStream(content, this._reportName + '.jsonl');
     zipFile.end();
     await finishPromise;
   }
+  _computeReportName(config) {
+    let reportName = 'report';
+    if (process.env.PWTEST_BLOB_SUFFIX) reportName += (0, _utils.sanitizeForFilePath)(process.env.PWTEST_BLOB_SUFFIX);
+    if (config.shard) {
+      const paddedNumber = `${config.shard.current}`.padStart(`${config.shard.total}`.length, '0');
+      reportName += `-${paddedNumber}`;
+    }
+    return reportName;
+  }
   _serializeAttachments(attachments) {
     return super._serializeAttachments(attachments).map(attachment => {
       if (!attachment.path) return attachment;

package/lib/reporters/html.js

@@ -401,7 +401,7 @@ class HtmlBuilder {
         _fs.default.mkdirSync(_path.default.join(this._reportFolder, 'data'), {
           recursive: true
         });
-        const extension = (0, _util.sanitizeForFilePath)(_path.default.extname(a.name).replace(/^\./, '')) || _utilsBundle.mime.getExtension(a.contentType) || 'dat';
+        const extension = (0, _utils.sanitizeForFilePath)(_path.default.extname(a.name).replace(/^\./, '')) || _utilsBundle.mime.getExtension(a.contentType) || 'dat';
         const sha1 = (0, _utils.calculateSha1)(a.body) + '.' + extension;
         _fs.default.writeFileSync(_path.default.join(this._reportFolder, 'data', sha1), a.body);
         return {

package/lib/reporters/merge.js

@@ -7,9 +7,11 @@ exports.createMergedReport = createMergedReport;
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
 var _teleReceiver = require("../isomorphic/teleReceiver");
+var _stringInternPool = require("../isomorphic/stringInternPool");
 var _reporters = require("../runner/reporters");
 var _multiplexer = require("./multiplexer");
 var _utils = require("playwright-core/lib/utils");
+var _blob = require("./blob");
 var _util = require("../util");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
@@ -90,7 +92,9 @@ async function extractAndParseReports(dir, shardFiles, printStatus) {
 function findMetadata(events, file) {
   var _events$;
   if (((_events$ = events[0]) === null || _events$ === void 0 ? void 0 : _events$.method) !== 'onBlobReportMetadata') throw new Error(`No metadata event found in ${file}`);
-  return events[0].params;
+  const metadata = events[0].params;
+  if (metadata.version > _blob.currentBlobReportVersion) throw new Error(`Blob report ${file} was created with a newer version of Playwright.`);
+  return metadata;
 }
 async function mergeEvents(dir, shardReportFiles, printStatus) {
   const events = [];
@@ -198,7 +202,7 @@ function mergeEndEvents(endEvents) {
 }
 async function sortedShardFiles(dir) {
   const files = await _fs.default.promises.readdir(dir);
-  return files.filter(file => file.startsWith('report-') && file.endsWith('.zip')).sort();
+  return files.filter(file => file.startsWith('report') && file.endsWith('.zip')).sort();
 }
 function printStatusToStdout(message) {
   process.stdout.write(`${message}\n`);
@@ -206,6 +210,7 @@ function printStatusToStdout(message) {
 class ProjectNamePatcher {
   constructor(_allTestIds, _projectNameSuffix) {
     this._testIds = new Set();
+    this._stringPool = new _stringInternPool.StringInternPool();
     this._allTestIds = _allTestIds;
     this._projectNameSuffix = _projectNameSuffix;
   }
@@ -263,6 +268,6 @@ class ProjectNamePatcher {
     // To avoid reporters being confused by clashing test ids, we automatically
     // make them unique and produce a separate test from each blob.
     while (this._allTestIds.has(testId)) testId = testId + '1';
-    return testId;
+    return this._stringPool.internString(testId);
   }
 }

package/lib/reporters/raw.js

@@ -7,7 +7,6 @@ exports.default = void 0;
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
 var _utils = require("playwright-core/lib/utils");
-var _util = require("../util");
 var _base = require("./base");
 var _json = require("./json");
 var _babelBundle = require("../transform/babelBundle");
@@ -49,7 +48,7 @@ class RawReporter {
       });
       let reportFile;
       for (let i = 0; i < 10; ++i) {
-        reportFile = _path.default.join(reportFolder, (0, _util.sanitizeForFilePath)(project.name || 'project') + (i ? '-' + i : '') + '.report');
+        reportFile = _path.default.join(reportFolder, (0, _utils.sanitizeForFilePath)(project.name || 'project') + (i ? '-' + i : '') + '.report');
         try {
           if (_fs.default.existsSync(reportFile)) continue;
         } catch (e) {}

package/lib/reporters/teleEmitter.js

@@ -203,7 +203,7 @@ class TeleReporterEmitter {
       retry: result.retry,
       workerIndex: result.workerIndex,
       parallelIndex: result.parallelIndex,
-      startTime: result.startTime.toISOString()
+      startTime: +result.startTime
     };
   }
   _serializeResultEnd(result) {
@@ -231,7 +231,7 @@ class TeleReporterEmitter {
       parentStepId: (_step$parent = step.parent) === null || _step$parent === void 0 ? void 0 : _step$parent[idSymbol],
       title: step.title,
       category: step.category,
-      startTime: step.startTime.toISOString(),
+      startTime: +step.startTime,
       location: this._relativeLocation(step.location)
     };
   }

package/lib/util.js

@@ -27,7 +27,6 @@ exports.normalizeAndSaveAttachment = normalizeAndSaveAttachment;
 exports.relativeFilePath = relativeFilePath;
 exports.resolveImportSpecifierExtension = resolveImportSpecifierExtension;
 exports.resolveReporterOutputPath = resolveReporterOutputPath;
-exports.sanitizeForFilePath = sanitizeForFilePath;
 exports.serializeError = serializeError;
 exports.stringifyStackFrames = stringifyStackFrames;
 exports.trimLongString = trimLongString;
@@ -187,9 +186,6 @@ function expectTypes(receiver, types, matcherName) {
     throw new Error(`${matcherName} can be only used with ${typesString} object${types.length > 1 ? 's' : ''}`);
   }
 }
-function sanitizeForFilePath(s) {
-  return s.replace(/[\x00-\x2C\x2E-\x2F\x3A-\x40\x5B-\x60\x7B-\x7F]+/g, '-');
-}
 function trimLongString(s, length = 100) {
   if (s.length <= length) return s;
   const hash = (0, _utils.calculateSha1)(s);
@@ -203,7 +199,7 @@ function addSuffixToFilePath(filePath, suffix, customExtension, sanitize = false
   const ext = _path.default.extname(filePath);
   const name = _path.default.basename(filePath, ext);
   const base = _path.default.join(dirname, name);
-  return (sanitize ? sanitizeForFilePath(base) : base) + suffix + (customExtension || ext);
+  return (sanitize ? (0, _utils.sanitizeForFilePath)(base) : base) + suffix + (customExtension || ext);
 }
 
 /**
@@ -253,7 +249,7 @@ async function normalizeAndSaveAttachment(outputPath, name, options = {}) {
     var _options$contentType;
     const hash = (0, _utils.calculateSha1)(options.path);
     if (!(0, _utils.isString)(name)) throw new Error('"name" should be string.');
-    const sanitizedNamePrefix = sanitizeForFilePath(name) + '-';
+    const sanitizedNamePrefix = (0, _utils.sanitizeForFilePath)(name) + '-';
     const dest = _path.default.join(outputPath, 'attachments', sanitizedNamePrefix + hash + _path.default.extname(options.path));
     await _fs.default.promises.mkdir(_path.default.dirname(dest), {
       recursive: true

package/lib/worker/testInfo.js

@@ -130,8 +130,8 @@ class TestInfoImpl {
       const relativeTestFilePath = _path.default.relative(this.project.testDir, test._requireFile.replace(/\.(spec|test)\.(js|ts|mjs)$/, ''));
       const sanitizedRelativePath = relativeTestFilePath.replace(process.platform === 'win32' ? new RegExp('\\\\', 'g') : new RegExp('/', 'g'), '-');
       const fullTitleWithoutSpec = test.titlePath().slice(1).join(' ');
-      let testOutputDir = (0, _util.trimLongString)(sanitizedRelativePath + '-' + (0, _util.sanitizeForFilePath)(fullTitleWithoutSpec));
-      if (projectInternal.id) testOutputDir += '-' + (0, _util.sanitizeForFilePath)(projectInternal.id);
+      let testOutputDir = (0, _util.trimLongString)(sanitizedRelativePath + '-' + (0, _utils.sanitizeForFilePath)(fullTitleWithoutSpec));
+      if (projectInternal.id) testOutputDir += '-' + (0, _utils.sanitizeForFilePath)(projectInternal.id);
       if (this.retry) testOutputDir += '-retry' + this.retry;
       if (this.repeatEachIndex) testOutputDir += '-repeat' + this.repeatEachIndex;
       return _path.default.join(this.project.outputDir, testOutputDir);
@@ -364,14 +364,14 @@ class TestInfoImpl {
   }
   _fsSanitizedTestName() {
     const fullTitleWithoutSpec = this.titlePath.slice(1).join(' ');
-    return (0, _util.sanitizeForFilePath)((0, _util.trimLongString)(fullTitleWithoutSpec));
+    return (0, _utils.sanitizeForFilePath)((0, _util.trimLongString)(fullTitleWithoutSpec));
   }
   snapshotPath(...pathSegments) {
     const subPath = _path.default.join(...pathSegments);
     const parsedSubPath = _path.default.parse(subPath);
     const relativeTestFilePath = _path.default.relative(this.project.testDir, this._test._requireFile);
     const parsedRelativeTestFilePath = _path.default.parse(relativeTestFilePath);
-    const projectNamePathSegment = (0, _util.sanitizeForFilePath)(this.project.name);
+    const projectNamePathSegment = (0, _utils.sanitizeForFilePath)(this.project.name);
     const snapshotPath = (this._projectInternal.snapshotPathTemplate || '').replace(/\{(.)?testDir\}/g, '$1' + this.project.testDir).replace(/\{(.)?snapshotDir\}/g, '$1' + this.project.snapshotDir).replace(/\{(.)?snapshotSuffix\}/g, this.snapshotSuffix ? '$1' + this.snapshotSuffix : '').replace(/\{(.)?testFileDir\}/g, '$1' + parsedRelativeTestFilePath.dir).replace(/\{(.)?platform\}/g, '$1' + process.platform).replace(/\{(.)?projectName\}/g, projectNamePathSegment ? '$1' + projectNamePathSegment : '').replace(/\{(.)?testName\}/g, '$1' + this._fsSanitizedTestName()).replace(/\{(.)?testFileName\}/g, '$1' + parsedRelativeTestFilePath.base).replace(/\{(.)?testFilePath\}/g, '$1' + relativeTestFilePath).replace(/\{(.)?arg\}/g, '$1' + _path.default.join(parsedSubPath.dir, parsedSubPath.name)).replace(/\{(.)?ext\}/g, parsedSubPath.ext ? '$1' + parsedSubPath.ext : '');
     return _path.default.normalize(_path.default.resolve(this._configInternal.configDir, snapshotPath));
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@playwright/test",
-  "version": "1.37.0-alpha-aug-3-2023",
+  "version": "1.37.0-alpha-aug-5-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.37.0-alpha-aug-3-2023"
+    "playwright-core": "1.37.0-alpha-aug-5-2023"
   },
   "optionalDependencies": {
     "fsevents": "2.3.2"

package/types/test.d.ts

@@ -6735,15 +6735,15 @@ interface TestConfigWebServer {
   command: string;
 
   /**
-   * The port that your http server is expected to appear on. It does wait until it accepts connections. Exactly one of
-   * `port` or `url` is required.
+   * The port that your http server is expected to appear on. It does wait until it accepts connections. Either `port`
+   * or `url` should be specified.
    */
   port?: number;
 
   /**
    * The url on your http server that is expected to return a 2xx, 3xx, 400, 401, 402, or 403 status code when the
    * server is ready to accept connections. Redirects (3xx status codes) are being followed and the new location is
-   * checked. Exactly one of `port` or `url` is required.
+   * checked. Either `port` or `url` should be specified.
    */
   url?: string;