@playwright/test 1.32.0 → 1.32.1-beta-1679703607000

package/lib/isomorphic/teleReceiver.js

@@ -70,7 +70,6 @@ class TeleReporterReceiver {
   }
   _onBegin(config, projects) {
     var _this$_reporter$onBeg, _this$_reporter;
-    const removeMissing = config.listOnly;
     for (const project of projects) {
       let projectSuite = this._rootSuite.suites.find(suite => suite.project().id === project.id);
       if (!projectSuite) {
@@ -80,7 +79,23 @@ class TeleReporterReceiver {
       }
       const p = this._parseProject(project);
       projectSuite.project = () => p;
-      this._mergeSuitesInto(project.suites, projectSuite, removeMissing);
+      this._mergeSuitesInto(project.suites, projectSuite);
+
+      // Remove deleted tests when listing. Empty suites will be auto-filtered
+      // in the UI layer.
+      if (config.listOnly) {
+        const testIds = new Set();
+        const collectIds = suite => {
+          suite.tests.map(t => t.testId).forEach(testId => testIds.add(testId));
+          suite.suites.forEach(collectIds);
+        };
+        project.suites.forEach(collectIds);
+        const filterTests = suite => {
+          suite.tests = suite.tests.filter(t => testIds.has(t.id));
+          suite.suites.forEach(filterTests);
+        };
+        filterTests(projectSuite);
+      }
     }
     (_this$_reporter$onBeg = (_this$_reporter = this._reporter).onBegin) === null || _this$_reporter$onBeg === void 0 ? void 0 : _this$_reporter$onBeg.call(_this$_reporter, this._parseConfig(config), this._rootSuite);
   }
@@ -92,6 +107,7 @@ class TeleReporterReceiver {
     testResult.workerIndex = payload.workerIndex;
     testResult.parallelIndex = payload.parallelIndex;
     testResult.startTime = new Date(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);
   }
   _onTestEnd(testId, payload) {
@@ -100,6 +116,7 @@ class TeleReporterReceiver {
     const result = test.resultsMap.get(payload.id);
     result.duration = payload.duration;
     result.status = payload.status;
+    result.statusEx = payload.status;
     result.errors = payload.errors;
     result.attachments = 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);
@@ -174,7 +191,7 @@ class TeleReporterReceiver {
       use: {}
     };
   }
-  _mergeSuitesInto(jsonSuites, parent, removeMissing) {
+  _mergeSuitesInto(jsonSuites, parent) {
     for (const jsonSuite of jsonSuites) {
       let targetSuite = parent.suites.find(s => s.title === jsonSuite.title);
       if (!targetSuite) {
@@ -185,15 +202,11 @@ class TeleReporterReceiver {
       targetSuite.location = jsonSuite.location;
       targetSuite._fileId = jsonSuite.fileId;
       targetSuite._parallelMode = jsonSuite.parallelMode;
-      this._mergeSuitesInto(jsonSuite.suites, targetSuite, removeMissing);
-      this._mergeTestsInto(jsonSuite.tests, targetSuite, removeMissing);
-    }
-    if (removeMissing) {
-      const suiteMap = new Map(parent.suites.map(p => [p.title, p]));
-      parent.suites = jsonSuites.map(s => suiteMap.get(s.title)).filter(Boolean);
+      this._mergeSuitesInto(jsonSuite.suites, targetSuite);
+      this._mergeTestsInto(jsonSuite.tests, targetSuite);
     }
   }
-  _mergeTestsInto(jsonTests, parent, removeMissing) {
+  _mergeTestsInto(jsonTests, parent) {
     for (const jsonTest of jsonTests) {
       let targetTest = parent.tests.find(s => s.title === jsonTest.title);
       if (!targetTest) {
@@ -204,10 +217,6 @@ class TeleReporterReceiver {
       }
       this._updateTest(jsonTest, targetTest);
     }
-    if (removeMissing) {
-      const testMap = new Map(parent.tests.map(p => [p.title, p]));
-      parent.tests = jsonTests.map(s => testMap.get(s.title)).filter(Boolean);
-    }
   }
   _updateTest(payload, test) {
     test.id = payload.testId;
@@ -307,6 +316,7 @@ class TeleTestCase {
       stderr: [],
       attachments: [],
       status: 'skipped',
+      statusEx: 'scheduled',
       steps: [],
       errors: [],
       stepMap: new Map(),

package/lib/runner/uiMode.js

@@ -34,6 +34,7 @@ class UIMode {
     this._page = void 0;
     this._testRun = void 0;
     this.globalCleanup = void 0;
+    this._globalWatcher = void 0;
     this._testWatcher = void 0;
     this._originalStderr = void 0;
     this._config = config;
@@ -53,28 +54,22 @@ class UIMode {
       sources: false
     };
     this._originalStderr = process.stderr.write.bind(process.stderr);
-    this._installGlobalWatcher();
-  }
-  _installGlobalWatcher() {
-    const projectDirs = new Set();
-    for (const p of this._config.projects) projectDirs.add(p.testDir);
-    let coalescingTimer;
-    const watcher = _utilsBundle.chokidar.watch([...projectDirs], {
-      ignoreInitial: true,
-      persistent: true
-    }).on('all', async event => {
-      if (event !== 'add' && event !== 'change' && event !== 'unlink') return;
-      if (coalescingTimer) clearTimeout(coalescingTimer);
-      coalescingTimer = setTimeout(() => {
-        this._dispatchEvent({
-          method: 'listChanged'
-        });
-      }, 200);
+    this._globalWatcher = new Watcher('deep', () => this._dispatchEvent({
+      method: 'listChanged'
+    }));
+    this._testWatcher = new Watcher('flat', events => {
+      const collector = new Set();
+      events.forEach(f => (0, _compilationCache.collectAffectedTestFiles)(f.file, collector));
+      this._dispatchEvent({
+        method: 'testFilesChanged',
+        params: {
+          testFileNames: [...collector]
+        }
+      });
     });
-    return watcher;
   }
   async runGlobalSetup() {
-    const reporter = await (0, _reporters.createReporter)(this._config, 'watch');
+    const reporter = await (0, _reporters.createReporter)(this._config, 'run');
     const taskRunner = (0, _tasks.createTaskRunnerForWatchSetup)(this._config, reporter);
     reporter.onConfigure(this._config);
     const context = {
@@ -86,6 +81,9 @@ class UIMode {
       status,
       cleanup: globalCleanup
     } = await taskRunner.runDeferCleanup(context, 0);
+    await reporter.onExit({
+      status
+    });
     if (status !== 'passed') {
       await globalCleanup();
       return status;
@@ -172,9 +170,12 @@ class UIMode {
     (0, _compilationCache.clearCompilationCache)();
     reporter.onConfigure(this._config);
     const status = await taskRunner.run(context, 0);
-    reporter.onExit({
+    await reporter.onExit({
       status
     });
+    const projectDirs = new Set();
+    for (const p of this._config.projects) projectDirs.add(p.testDir);
+    this._globalWatcher.update([...projectDirs], false);
   }
   async _runTests(testIds) {
     await this._stopTests();
@@ -212,43 +213,7 @@ class UIMode {
       files.add(fileName);
       (0, _compilationCache.dependenciesForTestFile)(fileName).forEach(file => files.add(file));
     }
-    const watchedFiles = [...files].sort();
-    if (this._testWatcher && JSON.stringify(this._testWatcher.watchedFiles) === JSON.stringify(watchedFiles)) return;
-    if (this._testWatcher) {
-      if (this._testWatcher.collector.size) this._dispatchEvent({
-        method: 'filesChanged',
-        params: {
-          fileNames: [...this._testWatcher.collector]
-        }
-      });
-      clearTimeout(this._testWatcher.timer);
-      this._testWatcher.watcher.close().then(() => {});
-      this._testWatcher = undefined;
-    }
-    if (!watchedFiles.length) return;
-    const collector = new Set();
-    const watcher = _utilsBundle.chokidar.watch(watchedFiles, {
-      ignoreInitial: true
-    }).on('all', async (event, file) => {
-      if (event !== 'add' && event !== 'change') return;
-      (0, _compilationCache.collectAffectedTestFiles)(file, collector);
-      if (this._testWatcher.timer) clearTimeout(this._testWatcher.timer);
-      this._testWatcher.timer = setTimeout(() => {
-        const fileNames = [...collector];
-        collector.clear();
-        this._dispatchEvent({
-          method: 'filesChanged',
-          params: {
-            fileNames
-          }
-        });
-      }, 250);
-    });
-    this._testWatcher = {
-      watcher,
-      watchedFiles,
-      collector
-    };
+    this._testWatcher.update([...files], true);
   }
   async _stopTests() {
     var _this$_testRun, _this$_testRun$stop, _this$_testRun2;
@@ -276,4 +241,44 @@ function chunkToPayload(type, chunk) {
     type,
     text: chunk
   };
+}
+class Watcher {
+  constructor(mode, onChange) {
+    this._onChange = void 0;
+    this._watchedFiles = [];
+    this._collector = [];
+    this._fsWatcher = void 0;
+    this._throttleTimer = void 0;
+    this._mode = void 0;
+    this._mode = mode;
+    this._onChange = onChange;
+  }
+  update(watchedFiles, reportPending) {
+    var _this$_fsWatcher;
+    if (JSON.stringify(this._watchedFiles) === JSON.stringify(watchedFiles)) return;
+    if (reportPending) this._reportEventsIfAny();
+    this._watchedFiles = watchedFiles;
+    (_this$_fsWatcher = this._fsWatcher) === null || _this$_fsWatcher === void 0 ? void 0 : _this$_fsWatcher.close().then(() => {});
+    this._fsWatcher = undefined;
+    this._collector.length = 0;
+    clearTimeout(this._throttleTimer);
+    this._throttleTimer = undefined;
+    if (!this._watchedFiles.length) return;
+    this._fsWatcher = _utilsBundle.chokidar.watch(watchedFiles, {
+      ignoreInitial: true
+    }).on('all', async (event, file) => {
+      if (this._throttleTimer) clearTimeout(this._throttleTimer);
+      if (this._mode === 'flat' && event !== 'add' && event !== 'change') return;
+      if (this._mode === 'deep' && event !== 'add' && event !== 'change' && event !== 'unlink' && event !== 'addDir' && event !== 'unlinkDir') return;
+      this._collector.push({
+        event,
+        file
+      });
+      this._throttleTimer = setTimeout(() => this._reportEventsIfAny(), 250);
+    });
+  }
+  _reportEventsIfAny() {
+    if (this._collector.length) this._onChange(this._collector.slice());
+    this._collector.length = 0;
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@playwright/test",
-  "version": "1.32.0",
+  "version": "1.32.1-beta-1679703607000",
   "description": "A high-level API to automate web browsers",
   "repository": "github:Microsoft/playwright",
   "homepage": "https://playwright.dev",
@@ -34,7 +34,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@types/node": "*",
-    "playwright-core": "1.32.0"
+    "playwright-core": "1.32.1-beta-1679703607000"
   },
   "optionalDependencies": {
     "fsevents": "2.3.2"