@playwright/test 1.31.2 → 1.32.0

package/lib/cli.js

@@ -7,7 +7,7 @@ exports.addTestCommands = addTestCommands;
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
 var _runner = require("./runner/runner");
-var _profiler = require("./common/profiler");
+var _utils = require("playwright-core/lib/utils");
 var _util = require("./util");
 var _html = require("./reporters/html");
 var _configLoader = require("./common/configLoader");
@@ -38,32 +38,8 @@ function addTestCommands(program) {
 function addTestCommand(program) {
   const command = program.command('test [test-filter...]');
   command.description('run tests with Playwright Test');
-  command.option('--browser <browser>', `Browser to use for tests, one of "all", "chromium", "firefox" or "webkit" (default: "chromium")`);
-  command.option('--headed', `Run tests in headed browsers (default: headless)`);
-  command.option('--debug', `Run tests with Playwright Inspector. Shortcut for "PWDEBUG=1" environment variable and "--timeout=0 --max-failures=1 --headed --workers=1" options`);
-  command.option('-c, --config <file>', `Configuration file, or a test directory with optional ${_configLoader.kDefaultConfigFiles.map(file => `"${file}"`).join('/')}`);
-  command.option('--forbid-only', `Fail if test.only is called (default: false)`);
-  command.option('--fully-parallel', `Run all tests in parallel (default: false)`);
-  command.option('-g, --grep <grep>', `Only run tests matching this regular expression (default: ".*")`);
-  command.option('-gv, --grep-invert <grep>', `Only run tests that do not match this regular expression`);
-  command.option('--global-timeout <timeout>', `Maximum time this test suite can run in milliseconds (default: unlimited)`);
-  command.option('--ignore-snapshots', `Ignore screenshot and snapshot expectations`);
-  command.option('-j, --workers <workers>', `Number of concurrent workers or percentage of logical CPU cores, use 1 to run in a single worker (default: 50%)`);
-  command.option('--list', `Collect all the tests and report them, but do not run`);
-  command.option('--max-failures <N>', `Stop after the first N failures`);
-  command.option('--no-deps', 'Do not run project dependencies');
-  command.option('--output <dir>', `Folder for output artifacts (default: "test-results")`);
-  command.option('--pass-with-no-tests', `Makes test run succeed even if no tests were found`);
-  command.option('--quiet', `Suppress stdio`);
-  command.option('--repeat-each <N>', `Run each test N times (default: 1)`);
-  command.option('--reporter <reporter>', `Reporter to use, comma-separated, can be ${_configLoader.builtInReporters.map(name => `"${name}"`).join(', ')} (default: "${_configLoader.baseFullConfig.reporter[0]}")`);
-  command.option('--retries <retries>', `Maximum retry count for flaky tests, zero for no retries (default: no retries)`);
-  command.option('--shard <shard>', `Shard tests and execute only the selected shard, specify in the form "current/all", 1-based, for example "3/5"`);
-  command.option('--project <project-name...>', `Only run tests from the specified list of projects (default: run all projects)`);
-  command.option('--timeout <timeout>', `Specify test timeout threshold in milliseconds, zero for unlimited (default: ${_configLoader.defaultTimeout})`);
-  command.option('--trace <mode>', `Force tracing mode, can be ${kTraceModes.map(mode => `"${mode}"`).join(', ')}`);
-  command.option('-u, --update-snapshots', `Update snapshots with actual results (default: only create missing snapshots)`);
-  command.option('-x', `Stop after the first failure`);
+  const options = testOptions.sort((a, b) => a[0].replace(/-/g, '').localeCompare(b[0].replace(/-/g, '')));
+  options.forEach(([name, description]) => command.option(name, description));
   command.action(async (args, opts) => {
     try {
       await runTests(args, opts);
@@ -80,7 +56,7 @@ Examples:
   $ npx playwright test my.spec.ts
   $ npx playwright test some.spec.ts:42
   $ npx playwright test --headed
-  $ npx playwright test --browser=webkit`);
+  $ npx playwright test --project=webkit`);
 }
 function addListFilesCommand(program) {
   const command = program.command('list-files [file-filter...]', {
@@ -113,7 +89,7 @@ Examples:
   $ npx playwright show-report playwright-report`);
 }
 async function runTests(args, opts) {
-  await (0, _profiler.startProfiling)();
+  await (0, _utils.startProfiling)();
   const overrides = overridesFromOptions(opts);
   if (opts.browser) {
     const browserOpt = opts.browser.toLowerCase();
@@ -131,13 +107,13 @@ async function runTests(args, opts) {
   if (opts.headed || opts.debug) overrides.use = {
     headless: false
   };
-  if (opts.debug) {
+  if (!opts.ui && opts.debug) {
     overrides.maxFailures = 1;
     overrides.timeout = 0;
     overrides.workers = 1;
     process.env.PWDEBUG = '1';
   }
-  if (opts.trace) {
+  if (!opts.ui && opts.trace) {
     if (!kTraceModes.includes(opts.trace)) throw new Error(`Unsupported trace mode "${opts.trace}", must be one of ${kTraceModes.map(mode => `"${mode}"`).join(', ')}`);
     overrides.use = overrides.use || {};
     overrides.use.trace = opts.trace;
@@ -158,8 +134,9 @@ async function runTests(args, opts) {
   config._internal.cliProjectFilter = opts.project || undefined;
   config._internal.passWithNoTests = !!opts.passWithNoTests;
   const runner = new _runner.Runner(config);
-  const status = process.env.PWTEST_WATCH ? await runner.watchAllTests() : await runner.runAllTests();
-  await (0, _profiler.stopProfiling)(undefined);
+  let status;
+  if (opts.ui) status = await runner.uiAllTests();else if (process.env.PWTEST_WATCH) status = await runner.watchAllTests();else status = await runner.runAllTests();
+  await (0, _utils.stopProfiling)('runner');
   if (status === 'interrupted') process.exit(130);
   process.exit(status === 'passed' ? 0 : 1);
 }
@@ -229,4 +206,5 @@ function restartWithExperimentalTsEsm(configFile) {
   });
   return true;
 }
-const kTraceModes = ['on', 'off', 'on-first-retry', 'retain-on-failure'];
+const kTraceModes = ['on', 'off', 'on-first-retry', 'retain-on-failure'];
+const testOptions = [['--browser <browser>', `Browser to use for tests, one of "all", "chromium", "firefox" or "webkit" (default: "chromium")`], ['-c, --config <file>', `Configuration file, or a test directory with optional ${_configLoader.kDefaultConfigFiles.map(file => `"${file}"`).join('/')}`], ['--debug', `Run tests with Playwright Inspector. Shortcut for "PWDEBUG=1" environment variable and "--timeout=0 --max-failures=1 --headed --workers=1" options`], ['--forbid-only', `Fail if test.only is called (default: false)`], ['--fully-parallel', `Run all tests in parallel (default: false)`], ['--global-timeout <timeout>', `Maximum time this test suite can run in milliseconds (default: unlimited)`], ['-g, --grep <grep>', `Only run tests matching this regular expression (default: ".*")`], ['-gv, --grep-invert <grep>', `Only run tests that do not match this regular expression`], ['--headed', `Run tests in headed browsers (default: headless)`], ['--ignore-snapshots', `Ignore screenshot and snapshot expectations`], ['--list', `Collect all the tests and report them, but do not run`], ['--max-failures <N>', `Stop after the first N failures`], ['--no-deps', 'Do not run project dependencies'], ['--output <dir>', `Folder for output artifacts (default: "test-results")`], ['--pass-with-no-tests', `Makes test run succeed even if no tests were found`], ['--project <project-name...>', `Only run tests from the specified list of projects (default: run all projects)`], ['--quiet', `Suppress stdio`], ['--repeat-each <N>', `Run each test N times (default: 1)`], ['--reporter <reporter>', `Reporter to use, comma-separated, can be ${_configLoader.builtInReporters.map(name => `"${name}"`).join(', ')} (default: "${_configLoader.baseFullConfig.reporter[0]}")`], ['--retries <retries>', `Maximum retry count for flaky tests, zero for no retries (default: no retries)`], ['--shard <shard>', `Shard tests and execute only the selected shard, specify in the form "current/all", 1-based, for example "3/5"`], ['--timeout <timeout>', `Specify test timeout threshold in milliseconds, zero for unlimited (default: ${_configLoader.defaultTimeout})`], ['--trace <mode>', `Force tracing mode, can be ${kTraceModes.map(mode => `"${mode}"`).join(', ')}`], ['--ui', `Run tests in interactive UI mode`], ['-u, --update-snapshots', `Update snapshots with actual results (default: only create missing snapshots)`], ['-j, --workers <workers>', `Number of concurrent workers or percentage of logical CPU cores, use 1 to run in a single worker (default: 50%)`], ['-x', `Stop after the first failure`]];

package/lib/common/compilationCache.js

@@ -8,6 +8,7 @@ exports.belongsToNodeModules = belongsToNodeModules;
 exports.clearCompilationCache = clearCompilationCache;
 exports.collectAffectedTestFiles = collectAffectedTestFiles;
 exports.currentFileDepsCollector = currentFileDepsCollector;
+exports.dependenciesForTestFile = dependenciesForTestFile;
 exports.fileDependenciesForTest = fileDependenciesForTest;
 exports.getFromCompilationCache = getFromCompilationCache;
 exports.serializeCompilationCache = serializeCompilationCache;
@@ -19,7 +20,6 @@ var _fs = _interopRequireDefault(require("fs"));
 var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
 var _utilsBundle = require("../utilsBundle");
-var _globals = require("./globals");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Copyright (c) Microsoft Corporation.
@@ -70,7 +70,6 @@ function getFromCompilationCache(filename, code, moduleUrl) {
   if (cache !== null && cache !== void 0 && cache.codePath) return {
     cachedCode: _fs.default.readFileSync(cache.codePath, 'utf-8')
   };
-  if ((0, _globals.isWorkerProcess)()) throw new Error('Internal error: unexpected file imported in the worker: ' + filename);
 
   // Then do the disk cache, this cache works between the Playwright Test runs.
   const isModule = !!moduleUrl;
@@ -160,6 +159,9 @@ function collectAffectedTestFiles(dependency, testFileCollector) {
     if (deps.has(dependency)) testFileCollector.add(testFile);
   }
 }
+function dependenciesForTestFile(filename) {
+  return fileDependencies.get(filename) || new Set();
+}
 
 // These two are only used in the dev mode, they are specifically excluding
 // files from packages/playwright*. In production mode, node_modules covers

package/lib/common/configLoader.js

@@ -12,6 +12,7 @@ var path = _interopRequireWildcard(require("path"));
 var _utils = require("playwright-core/lib/utils");
 var _transform = require("./transform");
 var _util = require("../util");
+var _globals = require("./globals");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /**
@@ -55,10 +56,12 @@ class ConfigLoader {
     if (this._fullConfig.configFile) throw new Error('Cannot load two config files');
     const config = await requireOrImportDefaultObject(file);
     await this._processConfigObject(config, path.dirname(file), file);
+    (0, _globals.setCurrentConfig)(this._fullConfig);
     return this._fullConfig;
   }
   async loadEmptyConfig(configDir) {
     await this._processConfigObject({}, configDir);
+    (0, _globals.setCurrentConfig)(this._fullConfig);
     return {};
   }
   async _processConfigObject(config, configDir, configFile) {
@@ -99,7 +102,7 @@ class ConfigLoader {
     if (config.outputDir !== undefined) config.outputDir = path.resolve(configDir, config.outputDir);
     if (config.snapshotDir !== undefined) config.snapshotDir = path.resolve(configDir, config.snapshotDir);
     this._fullConfig._internal.configDir = configDir;
-    this._fullConfig._internal.storeDir = path.resolve(configDir, '.playwright-store');
+    this._fullConfig._internal.storeDir = path.resolve(configDir, config._storeDir || 'playwright');
     this._fullConfig.configFile = configFile;
     this._fullConfig.rootDir = config.testDir || configDir;
     this._fullConfig._internal.globalOutputDir = takeFirst(config.outputDir, throwawayArtifactsPath, baseFullConfig._internal.globalOutputDir);

package/lib/common/fixtures.js

@@ -204,7 +204,7 @@ function fixtureParameterNames(fn, location, onError) {
   return fn[signatureSymbol];
 }
 function innerFixtureParameterNames(fn, location, onError) {
-  const text = fn.toString();
+  const text = filterOutComments(fn.toString());
   const match = text.match(/(?:async)?(?:\s+function)?[^(]*\(([^)]*)/);
   if (!match) return [];
   const trimmedParams = match[1].trim();
@@ -219,10 +219,39 @@ function innerFixtureParameterNames(fn, location, onError) {
   }
   const props = splitByComma(firstParam.substring(1, firstParam.length - 1)).map(prop => {
     const colon = prop.indexOf(':');
-    return colon === -1 ? prop : prop.substring(0, colon).trim();
+    return colon === -1 ? prop.trim() : prop.substring(0, colon).trim();
   });
+  const restProperty = props.find(prop => prop.startsWith('...'));
+  if (restProperty) {
+    onError({
+      message: `Rest property "${restProperty}" is not supported. List all used fixtures explicitly, separated by comma.`,
+      location
+    });
+    return [];
+  }
   return props;
 }
+function filterOutComments(s) {
+  const result = [];
+  let commentState = 'none';
+  for (let i = 0; i < s.length; ++i) {
+    if (commentState === 'singleline') {
+      if (s[i] === '\n') commentState = 'none';
+    } else if (commentState === 'multiline') {
+      if (s[i - 1] === '*' && s[i] === '/') commentState = 'none';
+    } else if (commentState === 'none') {
+      if (s[i] === '/' && s[i + 1] === '/') {
+        commentState = 'singleline';
+      } else if (s[i] === '/' && s[i + 1] === '*') {
+        commentState = 'multiline';
+        i += 2;
+      } else {
+        result.push(s[i]);
+      }
+    }
+  }
+  return result.join('');
+}
 function splitByComma(s) {
   const result = [];
   const stack = [];

package/lib/common/globals.js

@@ -3,10 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.currentConfig = currentConfig;
 exports.currentExpectTimeout = currentExpectTimeout;
 exports.currentTestInfo = currentTestInfo;
 exports.currentlyLoadingFileSuite = currentlyLoadingFileSuite;
 exports.isWorkerProcess = isWorkerProcess;
+exports.setCurrentConfig = setCurrentConfig;
 exports.setCurrentTestInfo = setCurrentTestInfo;
 exports.setCurrentlyLoadingFileSuite = setCurrentlyLoadingFileSuite;
 exports.setIsWorkerProcess = setIsWorkerProcess;
@@ -54,4 +56,11 @@ function setIsWorkerProcess() {
 }
 function isWorkerProcess() {
   return _isWorkerProcess;
+}
+let currentConfigValue = null;
+function setCurrentConfig(config) {
+  currentConfigValue = config;
+}
+function currentConfig() {
+  return currentConfigValue;
 }

package/lib/common/process.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ProcessRunner = void 0;
-var _profiler = require("./profiler");
+var _utils = require("playwright-core/lib/utils");
 var _util = require("../util");
 /**
  * Copyright Microsoft Corporation. All rights reserved.
@@ -45,6 +45,9 @@ process.on('SIGINT', () => {});
 process.on('SIGTERM', () => {});
 let processRunner;
 let processName;
+const startingEnv = {
+  ...process.env
+};
 process.on('message', async message => {
   if (message.method === '__init__') {
     const {
@@ -54,7 +57,7 @@ process.on('message', async message => {
     } = message.params;
     setTtyParams(process.stdout, processParams.stdoutParams);
     setTtyParams(process.stderr, processParams.stderrParams);
-    (0, _profiler.startProfiling)();
+    (0, _utils.startProfiling)();
     const {
       create
     } = require(runnerScript);
@@ -63,6 +66,15 @@ process.on('message', async message => {
     return;
   }
   if (message.method === '__stop__') {
+    const keys = new Set([...Object.keys(process.env), ...Object.keys(startingEnv)]);
+    const producedEnv = [...keys].filter(key => startingEnv[key] !== process.env[key]).map(key => {
+      var _process$env$key;
+      return [key, (_process$env$key = process.env[key]) !== null && _process$env$key !== void 0 ? _process$env$key : null];
+    });
+    sendMessageToParent({
+      method: '__env_produced__',
+      params: producedEnv
+    });
     await gracefullyCloseAndExit();
     return;
   }
@@ -101,7 +113,7 @@ async function gracefullyCloseAndExit() {
   setTimeout(() => process.exit(0), 30000);
   // Meanwhile, try to gracefully shutdown.
   await processRunner.gracefullyClose().catch(() => {});
-  await (0, _profiler.stopProfiling)(processName).catch(() => {});
+  await (0, _utils.stopProfiling)(processName).catch(() => {});
   process.exit(0);
 }
 function sendMessageToParent(message) {

package/lib/common/testType.js

@@ -187,7 +187,8 @@ class TestTypeImpl {
       title,
       location,
       canHaveChildren: true,
-      forceNoParent: false
+      forceNoParent: false,
+      wallTime: Date.now()
     });
     try {
       const result = await body();

package/lib/common/transform.js

@@ -127,7 +127,6 @@ function js2ts(resolved) {
   if (_fs.default.existsSync(tsxResolved)) return tsxResolved;
 }
 function transformHook(code, filename, moduleUrl) {
-  // If we are not TypeScript and there is no applicable preprocessor - bail out.
   const {
     cachedCode,
     addToCache

package/lib/index.js

@@ -3,7 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports._baseTest = void 0;
+exports._baseTest = void 0;
+Object.defineProperty(exports, "_store", {
+  enumerable: true,
+  get: function () {
+    return _store.store;
+  }
+});
+exports.default = void 0;
 Object.defineProperty(exports, "expect", {
   enumerable: true,
   get: function () {
@@ -18,7 +25,9 @@ var path = _interopRequireWildcard(require("path"));
 var playwrightLibrary = _interopRequireWildcard(require("playwright-core"));
 var _utils = require("playwright-core/lib/utils");
 var _testType = require("./common/testType");
+var _folders = require("./isomorphic/folders");
 var _expect = require("./matchers/expect");
+var _store = require("./store");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /**
@@ -39,7 +48,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 const _baseTest = _testType.rootTestType.test;
 exports._baseTest = _baseTest;
-(0, _utils.addStackIgnoreFilter)(frame => frame.file.startsWith(path.dirname(require.resolve('../package.json'))));
+(0, _utils.addInternalStackPrefix)(path.dirname(require.resolve('../package.json')));
 if (process['__pw_initiator__']) {
   const originalStackTraceLimit = Error.stackTraceLimit;
   Error.stackTraceLimit = 200;
@@ -87,20 +96,11 @@ const playwrightFixtures = {
     option: true
   }],
   connectOptions: [({}, use) => {
-    const wsEndpoint = process.env.PW_TEST_CONNECT_WS_ENDPOINT;
-    if (!wsEndpoint) return use(undefined);
-    let headers = process.env.PW_TEST_CONNECT_HEADERS ? JSON.parse(process.env.PW_TEST_CONNECT_HEADERS) : undefined;
-    if (process.env.PW_TEST_REUSE_CONTEXT) {
-      headers = {
-        ...headers,
-        'x-playwright-reuse-context': '1'
-      };
-    }
-    return use({
-      wsEndpoint,
-      headers,
-      _exposeNetwork: process.env.PW_TEST_CONNECT_EXPOSE_NETWORK
-    });
+    // Usually, when connect options are specified (e.g, in the config or in the environment),
+    // all launch() calls are turned into connect() calls.
+    // However, when running in "reuse browser" mode and connecting to the reusable server,
+    // only the default "browser" fixture should turn into reused browser.
+    use(process.env.PW_TEST_REUSE_CONTEXT ? undefined : connectOptionsFromEnv());
   }, {
     scope: 'worker',
     option: true
@@ -121,7 +121,7 @@ const playwrightFixtures = {
     let dir;
     await use(() => {
       if (!dir) {
-        dir = path.join(workerInfo.project.outputDir, '.playwright-artifacts-' + workerInfo.workerIndex);
+        dir = path.join(workerInfo.project.outputDir, (0, _folders.artifactsFolderName)(workerInfo.workerIndex));
         fs.mkdirSync(dir, {
           recursive: true
         });
@@ -138,7 +138,8 @@ const playwrightFixtures = {
     headless,
     channel,
     launchOptions,
-    connectOptions
+    connectOptions,
+    _artifactsDir
   }, use) => {
     const options = {
       handleSIGINT: false,
@@ -147,6 +148,7 @@ const playwrightFixtures = {
     };
     if (headless !== undefined) options.headless = headless;
     if (channel !== undefined) options.channel = channel;
+    options.tracesDir = path.join(_artifactsDir(), 'traces');
     for (const browserType of [playwright.chromium, playwright.firefox, playwright.webkit]) {
       browserType._defaultLaunchOptions = options;
       browserType._defaultConnectOptions = connectOptions;
@@ -162,9 +164,26 @@ const playwrightFixtures = {
   }],
   browser: [async ({
     playwright,
-    browserName
+    browserName,
+    _browserOptions
   }, use, testInfo) => {
     if (!['chromium', 'firefox', 'webkit'].includes(browserName)) throw new Error(`Unexpected browserName "${browserName}", must be one of "chromium", "firefox" or "webkit"`);
+
+    // Support for "reuse browser" mode.
+    const connectOptions = connectOptionsFromEnv();
+    if (connectOptions && process.env.PW_TEST_REUSE_CONTEXT) {
+      const browser = await playwright[browserName].connect({
+        ...connectOptions,
+        headers: {
+          'x-playwright-reuse-context': '1',
+          'x-playwright-launch-options': JSON.stringify(_browserOptions),
+          ...connectOptions.headers
+        }
+      });
+      await use(browser);
+      await browser.close();
+      return;
+    }
     const browser = await playwright[browserName].launch();
     await use(browser);
     await browser.close();
@@ -377,7 +396,6 @@ const playwrightFixtures = {
     playwright,
     _snapshotSuffix,
     _combinedContextOptions,
-    _reuseContext,
     _artifactsDir,
     trace,
     screenshot,
@@ -406,9 +424,10 @@ const playwrightFixtures = {
     const temporaryScreenshots = [];
     const testInfoImpl = testInfo;
     const reusedContexts = new Set();
+    let traceOrdinal = 0;
     const createInstrumentationListener = context => {
       return {
-        onApiCallBegin: (apiCall, stackTrace, userData) => {
+        onApiCallBegin: (apiCall, stackTrace, wallTime, userData) => {
           if (apiCall.startsWith('expect.')) return {
             userObject: null
           };
@@ -422,7 +441,8 @@ const playwrightFixtures = {
             category: 'pw:api',
             title: apiCall,
             canHaveChildren: false,
-            forceNoParent: false
+            forceNoParent: false,
+            wallTime
           });
           userData.userObject = step;
         },
@@ -438,9 +458,14 @@ const playwrightFixtures = {
       if (captureTrace) {
         const title = [path.relative(testInfo.project.testDir, testInfo.file) + ':' + testInfo.line, ...testInfo.titlePath.slice(1)].join(' › ');
         if (!tracing[kTracingStarted]) {
+          const ordinalSuffix = traceOrdinal ? `-${traceOrdinal}` : '';
+          ++traceOrdinal;
+          const retrySuffix = testInfo.retry ? `-${testInfo.retry}` : '';
+          const name = `${testInfo.testId}${retrySuffix}${ordinalSuffix}`;
           await tracing.start({
             ...traceOptions,
-            title
+            title,
+            name
           });
           tracing[kTracingStarted] = true;
         } else {
@@ -469,7 +494,8 @@ const playwrightFixtures = {
       context._instrumentation.addListener(createInstrumentationListener());
     };
     const startedCollectingArtifacts = Symbol('startedCollectingArtifacts');
-    const stopTraceChunkOnContextClosure = async tracing => {
+    const stopTracing = async tracing => {
+      if (tracing[startedCollectingArtifacts]) return;
       tracing[startedCollectingArtifacts] = true;
       if (captureTrace) {
         // Export trace for now. We'll know whether we have to preserve it
@@ -505,7 +531,7 @@ const playwrightFixtures = {
       // When reusing context, we get all previous contexts closed at the start of next test.
       // Do not record empty traces and useless screenshots for them.
       if (reusedContexts.has(context)) return;
-      await stopTraceChunkOnContextClosure(context.tracing);
+      await stopTracing(context.tracing);
       if (screenshotMode === 'on' || screenshotMode === 'only-on-failure') {
         // Capture screenshot for now. We'll know whether we have to preserve them
         // after the test finishes.
@@ -514,7 +540,7 @@ const playwrightFixtures = {
     };
     const onWillCloseRequestContext = async context => {
       const tracing = context._tracing;
-      await stopTraceChunkOnContextClosure(tracing);
+      await stopTracing(tracing);
     };
 
     // 1. Setup instrumentation and process existing contexts.
@@ -522,12 +548,17 @@ const playwrightFixtures = {
       browserType._onDidCreateContext = onDidCreateBrowserContext;
       browserType._onWillCloseContext = onWillCloseContext;
       browserType._defaultContextOptions = _combinedContextOptions;
+      const promises = [];
       const existingContexts = Array.from(browserType._contexts);
-      if (_reuseContext) existingContexts.forEach(c => reusedContexts.add(c));else await Promise.all(existingContexts.map(onDidCreateBrowserContext));
+      for (const context of existingContexts) {
+        if (context[kIsReusedContext]) reusedContexts.add(context);else promises.push(onDidCreateBrowserContext(context));
+      }
+      await Promise.all(promises);
     }
     {
       playwright.request._onDidCreateContext = onDidCreateRequestContext;
       playwright.request._onWillCloseContext = onWillCloseRequestContext;
+      playwright.request._defaultContextOptions = _combinedContextOptions;
       const existingApiRequests = Array.from(playwright.request._contexts);
       await Promise.all(existingApiRequests.map(onDidCreateRequestContext));
     }
@@ -540,17 +571,6 @@ const playwrightFixtures = {
     const testFailed = testInfo.status !== testInfo.expectedStatus;
     const preserveTrace = captureTrace && (traceMode === 'on' || testFailed && traceMode === 'retain-on-failure' || traceMode === 'on-first-retry' && testInfo.retry === 1);
     const captureScreenshots = screenshotMode === 'on' || screenshotMode === 'only-on-failure' && testFailed;
-    const traceAttachments = [];
-    const addTraceAttachment = () => {
-      const tracePath = testInfo.outputPath(`trace${traceAttachments.length ? '-' + traceAttachments.length : ''}.zip`);
-      traceAttachments.push(tracePath);
-      testInfo.attachments.push({
-        name: 'trace',
-        path: tracePath,
-        contentType: 'application/zip'
-      });
-      return tracePath;
-    };
     const screenshotAttachments = [];
     const addScreenshotAttachment = () => {
       const screenshotPath = testInfo.outputPath(`test-${testFailed ? 'failed' : 'finished'}-${screenshotAttachments.length + 1}.png`);
@@ -576,20 +596,12 @@ const playwrightFixtures = {
     const leftoverApiRequests = Array.from(playwright.request._contexts);
     playwright.request._onDidCreateContext = undefined;
     playwright.request._onWillCloseContext = undefined;
+    playwright.request._defaultContextOptions = undefined;
     testInfoImpl._onTestFailureImmediateCallbacks.delete(screenshotOnTestFailure);
-    const stopTraceChunkOnTestFinish = async tracing => {
-      // When we timeout during context.close(), we might end up with context still alive
-      // but artifacts being already collected. In this case, do not collect artifacts
-      // for the second time.
-      if (tracing[startedCollectingArtifacts]) return;
-      if (preserveTrace) await tracing.stopChunk({
-        path: addTraceAttachment()
-      });else if (captureTrace) await tracing.stopChunk();
-    };
 
     // 5. Collect artifacts from any non-closed contexts.
     await Promise.all(leftoverContexts.map(async context => {
-      await stopTraceChunkOnTestFinish(context.tracing);
+      await stopTracing(context.tracing);
       if (captureScreenshots) {
         await Promise.all(context.pages().map(async page => {
           if (page[screenshottedSymbol]) return;
@@ -605,14 +617,30 @@ const playwrightFixtures = {
       }
     }).concat(leftoverApiRequests.map(async context => {
       const tracing = context._tracing;
-      await stopTraceChunkOnTestFinish(tracing);
+      await stopTracing(tracing);
     })));
 
-    // 6. Either remove or attach temporary traces and screenshots for contexts closed
+    // 6. Save test trace.
+    if (preserveTrace) {
+      const events = testInfo._traceEvents;
+      if (events.length) {
+        const tracePath = path.join(_artifactsDir(), (0, _utils.createGuid)() + '.zip');
+        temporaryTraceFiles.push(tracePath);
+        await (0, _utils.saveTraceFile)(tracePath, events, traceOptions.sources);
+      }
+    }
+
+    // 7. Either remove or attach temporary traces and screenshots for contexts closed
     // before the test has finished.
-    await Promise.all(temporaryTraceFiles.map(async file => {
-      if (preserveTrace) await fs.promises.rename(file, addTraceAttachment()).catch(() => {});else await fs.promises.unlink(file).catch(() => {});
-    }));
+    if (preserveTrace && temporaryTraceFiles.length) {
+      const tracePath = testInfo.outputPath(`trace.zip`);
+      await (0, _utils.mergeTraceFiles)(tracePath, temporaryTraceFiles);
+      testInfo.attachments.push({
+        name: 'trace',
+        path: tracePath,
+        contentType: 'application/zip'
+      });
+    }
     await Promise.all(temporaryScreenshots.map(async file => {
       if (captureScreenshots) await fs.promises.rename(file, addScreenshotAttachment()).catch(() => {});else await fs.promises.unlink(file).catch(() => {});
     }));
@@ -709,6 +737,7 @@ const playwrightFixtures = {
     }
     const defaultContextOptions = playwright.chromium._defaultContextOptions;
     const context = await browser._newContextForReuse(defaultContextOptions);
+    context[kIsReusedContext] = true;
     await use(context);
   },
   page: async ({
@@ -726,10 +755,9 @@ const playwrightFixtures = {
     await use(page);
   },
   request: async ({
-    playwright,
-    _combinedContextOptions
+    playwright
   }, use) => {
-    const request = await playwright.request.newContext(_combinedContextOptions);
+    const request = await playwright.request.newContext();
     await use(request);
     await request.dispose();
   }
@@ -773,6 +801,17 @@ function normalizeScreenshotMode(screenshot) {
   return typeof screenshot === 'string' ? screenshot : screenshot.mode;
 }
 const kTracingStarted = Symbol('kTracingStarted');
+const kIsReusedContext = Symbol('kReusedContext');
+function connectOptionsFromEnv() {
+  const wsEndpoint = process.env.PW_TEST_CONNECT_WS_ENDPOINT;
+  if (!wsEndpoint) return undefined;
+  const headers = process.env.PW_TEST_CONNECT_HEADERS ? JSON.parse(process.env.PW_TEST_CONNECT_HEADERS) : undefined;
+  return {
+    wsEndpoint,
+    headers,
+    _exposeNetwork: process.env.PW_TEST_CONNECT_EXPOSE_NETWORK
+  };
+}
 const test = _baseTest.extend(playwrightFixtures);
 exports.test = test;
 var _default = test;

package/lib/isomorphic/folders.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.artifactsFolderName = artifactsFolderName;
+/**
+ * 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.
+ */
+
+function artifactsFolderName(workerIndex) {
+  return `.playwright-artifacts-${workerIndex}`;
+}