@playwright/test 1.36.0-alpha-1686749586000 → 1.36.0-alpha-jun-15-2023

package/lib/reporters/blob.js

@@ -10,6 +10,7 @@ var _utils = require("playwright-core/lib/utils");
 var _utilsBundle = require("playwright-core/lib/utilsBundle");
 var _stream = require("stream");
 var _teleEmitter = require("./teleEmitter");
+var _zipBundle = require("playwright-core/lib/zipBundle");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Copyright (c) Microsoft Corporation.
@@ -35,7 +36,7 @@ class BlobReporter extends _teleEmitter.TeleReporterEmitter {
     this._salt = void 0;
     this._copyFilePromises = new Set();
     this._outputDir = void 0;
-    this._reportFile = void 0;
+    this._reportName = void 0;
     this._options = options;
     this._salt = (0, _utils.createGuid)();
     this._messages.push({
@@ -53,16 +54,25 @@ class BlobReporter extends _teleEmitter.TeleReporterEmitter {
     _fs.default.mkdirSync(_path.default.join(this._outputDir, 'resources'), {
       recursive: true
     });
-    this._reportFile = this._computeOutputFileName(config);
+    this._reportName = this._computeReportName(config);
     super.onBegin(config, suite);
   }
   async onEnd(result) {
     await super.onEnd(result);
     const lines = this._messages.map(m => JSON.stringify(m) + '\n');
     const content = _stream.Readable.from(lines);
+    const zipFile = new _zipBundle.yazl.ZipFile();
+    const zipFinishPromise = new _utils.ManualPromise();
+    zipFile.on('error', error => zipFinishPromise.reject(error));
+    const zipFileName = _path.default.join(this._outputDir, this._reportName + '.zip');
+    zipFile.outputStream.pipe(_fs.default.createWriteStream(zipFileName)).on('close', () => {
+      zipFinishPromise.resolve(undefined);
+    });
+    zipFile.addReadStream(content, this._reportName + '.jsonl');
+    zipFile.end();
     await Promise.all([...this._copyFilePromises,
     // Requires Node v14.18.0+
-    _fs.default.promises.writeFile(this._reportFile, content).catch(e => console.error(`Failed to write report ${this._reportFile}: ${e}`))]);
+    zipFinishPromise.catch(e => console.error(`Failed to write report ${zipFileName}: ${e}`))]);
   }
   _serializeAttachments(attachments) {
     return super._serializeAttachments(attachments).map(attachment => {
@@ -78,13 +88,13 @@ class BlobReporter extends _teleEmitter.TeleReporterEmitter {
       };
     });
   }
-  _computeOutputFileName(config) {
+  _computeReportName(config) {
     let shardSuffix = '';
     if (config.shard) {
       const paddedNumber = `${config.shard.current}`.padStart(`${config.shard.total}`.length, '0');
       shardSuffix = `${paddedNumber}-of-${config.shard.total}-`;
     }
-    return _path.default.join(this._outputDir, `report-${shardSuffix}${(0, _utils.createGuid)()}.jsonl`);
+    return `report-${shardSuffix}${(0, _utils.createGuid)()}`;
   }
   _startCopyingFile(from, to) {
     const copyPromise = _fs.default.promises.copyFile(from, to).catch(e => {

package/lib/reporters/merge.js

@@ -9,6 +9,7 @@ var _path = _interopRequireDefault(require("path"));
 var _teleReceiver = require("../isomorphic/teleReceiver");
 var _reporters = require("../runner/reporters");
 var _multiplexer = require("./multiplexer");
+var _utils = require("playwright-core/lib/utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Copyright (c) Microsoft Corporation.
@@ -47,12 +48,24 @@ function patchAttachmentPaths(events, resourceDir) {
 function parseEvents(reportJsonl) {
   return reportJsonl.toString().split('\n').filter(line => line.length).map(line => JSON.parse(line));
 }
+async function extractReportFromZip(file) {
+  const zipFile = new _utils.ZipFile(file);
+  const entryNames = await zipFile.entries();
+  try {
+    for (const entryName of entryNames) {
+      if (entryName.endsWith('.jsonl')) return await zipFile.read(entryName);
+    }
+  } finally {
+    zipFile.close();
+  }
+  throw new Error(`Cannot find *.jsonl file in ${file}`);
+}
 async function mergeEvents(dir, shardReportFiles) {
   const events = [];
   const beginEvents = [];
   const endEvents = [];
   for (const reportFile of shardReportFiles) {
-    const reportJsonl = await _fs.default.promises.readFile(_path.default.join(dir, reportFile), 'utf8');
+    const reportJsonl = await extractReportFromZip(_path.default.join(dir, reportFile));
     const parsedEvents = parseEvents(reportJsonl);
     for (const event of parsedEvents) {
       if (event.method === 'onBegin') beginEvents.push(event);else if (event.method === 'onEnd') endEvents.push(event);else if (event.method === 'onBlobReportMetadata') new ProjectNamePatcher(event.params.projectSuffix).patchEvents(parsedEvents);else events.push(event);
@@ -134,7 +147,7 @@ function mergeEndEvents(endEvents) {
 }
 async function sortedShardFiles(dir) {
   const files = await _fs.default.promises.readdir(dir);
-  return files.filter(file => file.endsWith('.jsonl')).sort();
+  return files.filter(file => file.startsWith('report-') && file.endsWith('.zip')).sort();
 }
 class ProjectNamePatcher {
   constructor(_projectNameSuffix) {

package/lib/worker/testInfo.js

@@ -184,7 +184,8 @@ class TestInfoImpl {
       const visit = step => {
         // Never nest into under another lax element, it could be a series
         // of no-reply actions, ala page.continue().
-        if (!step.endWallTime && step.category === data.category && !step.laxParent) parentStep = step;
+        const canNest = step.category === data.category || step.category === 'expect' && data.category === 'attach';
+        if (!step.endWallTime && canNest && !step.laxParent) parentStep = step;
         step.steps.forEach(visit);
       };
       this._steps.forEach(visit);
@@ -297,7 +298,8 @@ class TestInfoImpl {
     const step = this._addStep({
       title: `attach "${name}"`,
       category: 'attach',
-      wallTime: Date.now()
+      wallTime: Date.now(),
+      laxParent: true
     });
     this._attachWithoutStep(attachment);
     step.complete({});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@playwright/test",
-  "version": "1.36.0-alpha-1686749586000",
+  "version": "1.36.0-alpha-jun-15-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.36.0-alpha-1686749586000"
+    "playwright-core": "1.36.0-alpha-jun-15-2023"
   },
   "optionalDependencies": {
     "fsevents": "2.3.2"