playwright 1.45.1 → 1.45.2

package/lib/common/globals.js

@@ -9,8 +9,6 @@ exports.isWorkerProcess = isWorkerProcess;
 exports.setCurrentTestInfo = setCurrentTestInfo;
 exports.setCurrentlyLoadingFileSuite = setCurrentlyLoadingFileSuite;
 exports.setIsWorkerProcess = setIsWorkerProcess;
-exports.setTestLifecycleInstrumentation = setTestLifecycleInstrumentation;
-exports.testLifecycleInstrumentation = testLifecycleInstrumentation;
 /**
  * Copyright Microsoft Corporation. All rights reserved.
  *
@@ -47,11 +45,4 @@ function setIsWorkerProcess() {
 }
 function isWorkerProcess() {
   return _isWorkerProcess;
-}
-let _testLifecycleInstrumentation;
-function setTestLifecycleInstrumentation(instrumentation) {
-  _testLifecycleInstrumentation = instrumentation;
-}
-function testLifecycleInstrumentation() {
-  return _testLifecycleInstrumentation;
 }

package/lib/index.js

@@ -31,6 +31,7 @@ Object.defineProperty(exports, "mergeTests", {
 exports.test = void 0;
 var fs = _interopRequireWildcard(require("fs"));
 var path = _interopRequireWildcard(require("path"));
+var playwrightLibrary = _interopRequireWildcard(require("playwright-core"));
 var _utils = require("playwright-core/lib/utils");
 var _testType = require("./common/testType");
 var _globals = require("./common/globals");
@@ -78,16 +79,8 @@ const playwrightFixtures = {
     scope: 'worker',
     option: true
   }],
-  _playwrightImpl: [({}, use) => use(require('playwright-core')), {
-    scope: 'worker'
-  }],
-  playwright: [async ({
-    _playwrightImpl,
-    screenshot
-  }, use) => {
-    await connector.setPlaywright(_playwrightImpl, screenshot);
-    await use(_playwrightImpl);
-    await connector.setPlaywright(undefined, screenshot);
+  playwright: [async ({}, use) => {
+    await use(require('playwright-core'));
   }, {
     scope: 'worker',
     _hideStep: true
@@ -397,7 +390,7 @@ const playwrightFixtures = {
     navigationTimeout,
     testIdAttribute
   }, use, testInfo) => {
-    if (testIdAttribute) playwright.selectors.setTestIdAttribute(testIdAttribute);
+    if (testIdAttribute) playwrightLibrary.selectors.setTestIdAttribute(testIdAttribute);
     testInfo.snapshotSuffix = process.platform;
     if ((0, _utils.debugMode)()) testInfo.setTimeout(0);
     for (const browserType of [playwright.chromium, playwright.firefox, playwright.webkit]) {
@@ -421,6 +414,62 @@ const playwrightFixtures = {
     auto: 'all-hooks-included',
     _title: 'context configuration'
   }],
+  _setupArtifacts: [async ({
+    playwright,
+    screenshot
+  }, use, testInfo) => {
+    const artifactsRecorder = new ArtifactsRecorder(playwright, tracing().artifactsDir(), screenshot);
+    await artifactsRecorder.willStartTest(testInfo);
+    const csiListener = {
+      onApiCallBegin: (apiName, params, frames, userData, out) => {
+        const testInfo = (0, _globals.currentTestInfo)();
+        if (!testInfo || apiName.includes('setTestIdAttribute')) return {
+          userObject: null
+        };
+        const step = testInfo._addStep({
+          location: frames[0],
+          category: 'pw:api',
+          title: renderApiCall(apiName, params),
+          apiName,
+          params
+        });
+        userData.userObject = step;
+        out.stepId = step.stepId;
+      },
+      onApiCallEnd: (userData, error) => {
+        const step = userData.userObject;
+        step === null || step === void 0 || step.complete({
+          error
+        });
+      },
+      onWillPause: () => {
+        var _currentTestInfo;
+        (_currentTestInfo = (0, _globals.currentTestInfo)()) === null || _currentTestInfo === void 0 || _currentTestInfo.setTimeout(0);
+      },
+      runAfterCreateBrowserContext: async context => {
+        await (artifactsRecorder === null || artifactsRecorder === void 0 ? void 0 : artifactsRecorder.didCreateBrowserContext(context));
+        const testInfo = (0, _globals.currentTestInfo)();
+        if (testInfo) attachConnectedHeaderIfNeeded(testInfo, context.browser());
+      },
+      runAfterCreateRequestContext: async context => {
+        await (artifactsRecorder === null || artifactsRecorder === void 0 ? void 0 : artifactsRecorder.didCreateRequestContext(context));
+      },
+      runBeforeCloseBrowserContext: async context => {
+        await (artifactsRecorder === null || artifactsRecorder === void 0 ? void 0 : artifactsRecorder.willCloseBrowserContext(context));
+      },
+      runBeforeCloseRequestContext: async context => {
+        await (artifactsRecorder === null || artifactsRecorder === void 0 ? void 0 : artifactsRecorder.willCloseRequestContext(context));
+      }
+    };
+    const clientInstrumentation = playwright._instrumentation;
+    clientInstrumentation.addListener(csiListener);
+    await use();
+    clientInstrumentation.removeListener(csiListener);
+    await artifactsRecorder.didFinishTest();
+  }, {
+    auto: 'all-hooks-included',
+    _title: 'trace recording'
+  }],
   _contextFactory: [async ({
     browser,
     video,
@@ -621,6 +670,7 @@ class ArtifactsRecorder {
   }
   async willStartTest(testInfo) {
     this._testInfo = testInfo;
+    testInfo._onDidFinishTestFunction = () => this.didFinishTestFunction();
 
     // Since beforeAll(s), test and afterAll(s) reuse the same TestInfo, make sure we do not
     // overwrite previous screenshots.
@@ -787,94 +837,4 @@ function renderApiCall(apiName, params) {
 function tracing() {
   return test.info()._tracing;
 }
-class InstrumentationConnector {
-  constructor() {
-    this._playwright = void 0;
-    this._screenshot = 'off';
-    this._artifactsRecorder = void 0;
-    this._testIsRunning = false;
-    (0, _globals.setTestLifecycleInstrumentation)(this);
-  }
-  async setPlaywright(playwright, screenshot) {
-    if (this._playwright) {
-      if (this._testIsRunning) {
-        // When "playwright" is destroyed during a test, collect artifacts immediately.
-        await this.onTestEnd();
-      }
-      const clientInstrumentation = this._playwright._instrumentation;
-      clientInstrumentation.removeListener(this);
-    }
-    this._playwright = playwright;
-    this._screenshot = screenshot;
-    if (this._playwright) {
-      const clientInstrumentation = this._playwright._instrumentation;
-      clientInstrumentation.addListener(this);
-      if (this._testIsRunning) {
-        // When "playwright" is created during a test, wire it up immediately.
-        await this.onTestBegin();
-      }
-    }
-  }
-  async onTestBegin() {
-    this._testIsRunning = true;
-    if (this._playwright) {
-      this._artifactsRecorder = new ArtifactsRecorder(this._playwright, tracing().artifactsDir(), this._screenshot);
-      await this._artifactsRecorder.willStartTest((0, _globals.currentTestInfo)());
-    }
-  }
-  async onTestFunctionEnd() {
-    var _this$_artifactsRecor;
-    await ((_this$_artifactsRecor = this._artifactsRecorder) === null || _this$_artifactsRecor === void 0 ? void 0 : _this$_artifactsRecor.didFinishTestFunction());
-  }
-  async onTestEnd() {
-    var _this$_artifactsRecor2;
-    await ((_this$_artifactsRecor2 = this._artifactsRecorder) === null || _this$_artifactsRecor2 === void 0 ? void 0 : _this$_artifactsRecor2.didFinishTest());
-    this._artifactsRecorder = undefined;
-    this._testIsRunning = false;
-  }
-  onApiCallBegin(apiName, params, frames, userData, out) {
-    const testInfo = (0, _globals.currentTestInfo)();
-    if (!testInfo || apiName.includes('setTestIdAttribute')) return {
-      userObject: null
-    };
-    const step = testInfo._addStep({
-      location: frames[0],
-      category: 'pw:api',
-      title: renderApiCall(apiName, params),
-      apiName,
-      params
-    });
-    userData.userObject = step;
-    out.stepId = step.stepId;
-  }
-  onApiCallEnd(userData, error) {
-    const step = userData.userObject;
-    step === null || step === void 0 || step.complete({
-      error
-    });
-  }
-  onWillPause() {
-    var _currentTestInfo;
-    (_currentTestInfo = (0, _globals.currentTestInfo)()) === null || _currentTestInfo === void 0 || _currentTestInfo.setTimeout(0);
-  }
-  async runAfterCreateBrowserContext(context) {
-    var _this$_artifactsRecor3;
-    await ((_this$_artifactsRecor3 = this._artifactsRecorder) === null || _this$_artifactsRecor3 === void 0 ? void 0 : _this$_artifactsRecor3.didCreateBrowserContext(context));
-    const testInfo = (0, _globals.currentTestInfo)();
-    if (testInfo) attachConnectedHeaderIfNeeded(testInfo, context.browser());
-  }
-  async runAfterCreateRequestContext(context) {
-    var _this$_artifactsRecor4;
-    await ((_this$_artifactsRecor4 = this._artifactsRecorder) === null || _this$_artifactsRecor4 === void 0 ? void 0 : _this$_artifactsRecor4.didCreateRequestContext(context));
-  }
-  async runBeforeCloseBrowserContext(context) {
-    var _this$_artifactsRecor5;
-    await ((_this$_artifactsRecor5 = this._artifactsRecorder) === null || _this$_artifactsRecor5 === void 0 ? void 0 : _this$_artifactsRecor5.willCloseBrowserContext(context));
-  }
-  async runBeforeCloseRequestContext(context) {
-    var _this$_artifactsRecor6;
-    await ((_this$_artifactsRecor6 = this._artifactsRecorder) === null || _this$_artifactsRecor6 === void 0 ? void 0 : _this$_artifactsRecor6.willCloseRequestContext(context));
-  }
-}
-const connector = new InstrumentationConnector();
 const test = exports.test = _baseTest.extend(playwrightFixtures);

package/lib/worker/testInfo.js

@@ -73,6 +73,7 @@ class TestInfoImpl {
     this._projectInternal = void 0;
     this._configInternal = void 0;
     this._steps = [];
+    this._onDidFinishTestFunction = void 0;
     this._stages = [];
     this._hasNonRetriableError = false;
     this._hasUnhandledError = false;

package/lib/worker/workerMain.js

@@ -277,10 +277,6 @@ class WorkerMain extends _process.ProcessRunner {
     this._lastRunningTests.push(test);
     if (this._lastRunningTests.length > 10) this._lastRunningTests.shift();
     let shouldRunAfterEachHooks = false;
-    const tracingSlot = {
-      timeout: this._project.project.timeout,
-      elapsed: 0
-    };
     testInfo._allowSkips = true;
     await testInfo._runAsStage({
       title: 'setup and test'
@@ -288,11 +284,9 @@ class WorkerMain extends _process.ProcessRunner {
       await testInfo._runAsStage({
         title: 'start tracing',
         runnable: {
-          type: 'test',
-          slot: tracingSlot
+          type: 'test'
         }
       }, async () => {
-        var _testLifecycleInstrum, _testLifecycleInstrum2;
         // Ideally, "trace" would be an config-level option belonging to the
         // test runner instead of a fixture belonging to Playwright.
         // However, for backwards compatibility, we have to read it from a fixture today.
@@ -301,7 +295,6 @@ class WorkerMain extends _process.ProcessRunner {
         if (!traceFixtureRegistration) return;
         if (typeof traceFixtureRegistration.fn === 'function') throw new Error(`"trace" option cannot be a function`);
         await testInfo._tracing.startIfNeeded(traceFixtureRegistration.fn);
-        await ((_testLifecycleInstrum = (0, _globals.testLifecycleInstrumentation)()) === null || _testLifecycleInstrum === void 0 || (_testLifecycleInstrum2 = _testLifecycleInstrum.onTestBegin) === null || _testLifecycleInstrum2 === void 0 ? void 0 : _testLifecycleInstrum2.call(_testLifecycleInstrum));
       });
       if (this._isStopped || isSkipped) {
         // Two reasons to get here:
@@ -373,14 +366,15 @@ class WorkerMain extends _process.ProcessRunner {
           title: 'on-test-function-finish',
           runnable: {
             type: 'test',
-            slot: tracingSlot
+            slot: afterHooksSlot
           }
         }, async () => {
-          var _testLifecycleInstrum3, _testLifecycleInstrum4;
-          await ((_testLifecycleInstrum3 = (0, _globals.testLifecycleInstrumentation)()) === null || _testLifecycleInstrum3 === void 0 || (_testLifecycleInstrum4 = _testLifecycleInstrum3.onTestFunctionEnd) === null || _testLifecycleInstrum4 === void 0 ? void 0 : _testLifecycleInstrum4.call(_testLifecycleInstrum3));
+          var _testInfo$_onDidFinis;
+          return (_testInfo$_onDidFinis = testInfo._onDidFinishTestFunction) === null || _testInfo$_onDidFinis === void 0 ? void 0 : _testInfo$_onDidFinis.call(testInfo);
         });
       } catch (error) {
         var _firstAfterHooksError;
+        if (error instanceof _timeoutManager.TimeoutManagerError) didTimeoutInAfterHooks = true;
         firstAfterHooksError = (_firstAfterHooksError = firstAfterHooksError) !== null && _firstAfterHooksError !== void 0 ? _firstAfterHooksError : error;
       }
       try {
@@ -472,6 +466,10 @@ class WorkerMain extends _process.ProcessRunner {
         if (firstWorkerCleanupError) throw firstWorkerCleanupError;
       }).catch(() => {}); // Ignore the top-level error, it is already inside TestInfo.errors.
     }
+    const tracingSlot = {
+      timeout: this._project.project.timeout,
+      elapsed: 0
+    };
     await testInfo._runAsStage({
       title: 'stop tracing',
       runnable: {
@@ -479,8 +477,6 @@ class WorkerMain extends _process.ProcessRunner {
         slot: tracingSlot
       }
     }, async () => {
-      var _testLifecycleInstrum5, _testLifecycleInstrum6;
-      await ((_testLifecycleInstrum5 = (0, _globals.testLifecycleInstrumentation)()) === null || _testLifecycleInstrum5 === void 0 || (_testLifecycleInstrum6 = _testLifecycleInstrum5.onTestEnd) === null || _testLifecycleInstrum6 === void 0 ? void 0 : _testLifecycleInstrum6.call(_testLifecycleInstrum5));
       await testInfo._tracing.stopIfNeeded();
     }).catch(() => {}); // Ignore the top-level error, it is already inside TestInfo.errors.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "playwright",
-  "version": "1.45.1",
+  "version": "1.45.2",
   "description": "A high-level API to automate web browsers",
   "repository": {
     "type": "git",
@@ -58,7 +58,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "playwright-core": "1.45.1"
+    "playwright-core": "1.45.2"
   },
   "optionalDependencies": {
     "fsevents": "2.3.2"