@serenity-js/playwright-test 3.21.2 → 3.22.0

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.22.0](https://github.com/serenity-js/serenity-js/compare/v3.21.2...v3.22.0) (2024-04-11)
+
+
+### Bug Fixes
+
+* **deps:** update playwright dependencies to v1.43.0 ([f9a2f9d](https://github.com/serenity-js/serenity-js/commit/f9a2f9d837765843af76ade9a78f92e32e1d884f))
+* **playwright-test:** support for Playwright Test 1.43.0 ([0162b6e](https://github.com/serenity-js/serenity-js/commit/0162b6e0b56e5cbf11ab03326181480b740f24ef))
+
+
+
+
+
 ## [3.21.2](https://github.com/serenity-js/serenity-js/compare/v3.21.1...v3.21.2) (2024-03-31)
 
 **Note:** Version bump only for package @serenity-js/playwright-test

package/lib/api/PerformActivitiesAsPlaywrightSteps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PerformActivitiesAsPlaywrightSteps.d.ts","sourceRoot":"","sources":["../../src/api/PerformActivitiesAsPlaywrightSteps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,IAAI,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAkB,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAGtE,qBAAa,kCAAmC,SAAQ,iBAAiB;IAKjE,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAFrB,KAAK,EAAE,kBAAkB,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EAC5C,KAAK,EAAE,iBAAiB,EACP,IAAI,EAAE,OAAO,IAAI;IAKvB,OAAO,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBzD,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,UAAU;CAQrB"}
+{"version":3,"file":"PerformActivitiesAsPlaywrightSteps.d.ts","sourceRoot":"","sources":["../../src/api/PerformActivitiesAsPlaywrightSteps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,IAAI,IAAI,EAAY,MAAM,kBAAkB,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAkB,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAGtE,qBAAa,kCAAmC,SAAQ,iBAAiB;IAKjE,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAFrB,KAAK,EAAE,kBAAkB,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EAC5C,KAAK,EAAE,iBAAiB,EACP,IAAI,EAAE,OAAO,IAAI;IAKvB,OAAO,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBzD,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,UAAU;CAQrB"}

package/lib/api/PerformActivitiesAsPlaywrightSteps.js

@@ -11,16 +11,16 @@ class PerformActivitiesAsPlaywrightSteps extends core_1.PerformActivities {
     }
     async perform(activity) {
         const testInfo = this.test.info();
-        // see https://github.com/microsoft/playwright/issues/23157
-        const runAsStep = (testInfo['_runAsStep']).bind(testInfo);
-        return runAsStep({
-            category: 'test.step',
-            title: this.nameOf(activity),
-            location: this.locationOf(activity),
-            params: this.parametersOf(activity),
-        }, async (step_) => {
-            await super.perform(activity);
-        });
+        // Monkey-patch addStep to allow for passing a pre-computed location
+        // see https://github.com/microsoft/playwright/issues/30160
+        const originalAddStep = testInfo._addStep;
+        testInfo._addStep = (data) => {
+            data.location = this.locationOf(activity);
+            data.params = this.parametersOf(activity);
+            return originalAddStep.call(testInfo, data);
+        };
+        await this.test.step(this.nameOf(activity), () => super.perform(activity));
+        testInfo._addStep = originalAddStep;
     }
     parametersOf(activity) {
         if (activity instanceof core_1.Interaction) {

package/lib/api/PerformActivitiesAsPlaywrightSteps.js.map

@@ -1 +1 @@
-{"version":3,"file":"PerformActivitiesAsPlaywrightSteps.js","sourceRoot":"","sources":["../../src/api/PerformActivitiesAsPlaywrightSteps.ts"],"names":[],"mappings":";;;AAEA,4CAAsE;AAEtE,oDAA6D;AAE7D,MAAa,kCAAmC,SAAQ,wBAAiB;IAKhD;IAHrB,YACI,KAA4C,EAC5C,KAAwB,EACP,IAAiB;QAElC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAFH,SAAI,GAAJ,IAAI,CAAa;IAGtC,CAAC;IAEQ,KAAK,CAAC,OAAO,CAAC,QAAkB;QACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAElC,2DAA2D;QAC3D,MAAM,SAAS,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAoG,CAAC;QAE7J,OAAO,SAAS,CAAC;YACb,QAAQ,EAAE,WAAW;YACrB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;YAC5B,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;YACnC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC;SACtC,EAAE,KAAK,EAAC,KAAK,EAAC,EAAE;YACb,MAAM,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,YAAY,CAAC,QAAkB;QACnC,IAAI,QAAQ,YAAY,kBAAW,EAAE;YACjC,OAAO,IAAA,6BAAmB,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACvD,GAAG,CAAC,KAAK,CAAC,GAAG,IAAA,QAAC,EAAA,GAAI,QAAQ,CAAC,KAAK,CAAE,EAAE,CAAC;gBACrC,OAAO,GAAG,CAAC;YACf,CAAC,EAAE,EAAE,CAAC,CAAC;SACV;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAEO,UAAU,CAAC,QAAkB;QACjC,MAAM,qBAAqB,GAAG,QAAQ,CAAC,qBAAqB,EAAE,CAAC;QAC/D,OAAO;YACH,IAAI,EAAE,qBAAqB,CAAC,IAAI,CAAC,KAAK;YACtC,IAAI,EAAE,qBAAqB,CAAC,IAAI;YAChC,MAAM,EAAE,qBAAqB,CAAC,MAAM;SACvC,CAAC;IACN,CAAC;CACJ;AA5CD,gFA4CC"}
+{"version":3,"file":"PerformActivitiesAsPlaywrightSteps.js","sourceRoot":"","sources":["../../src/api/PerformActivitiesAsPlaywrightSteps.ts"],"names":[],"mappings":";;;AAEA,4CAAsE;AAEtE,oDAA6D;AAE7D,MAAa,kCAAmC,SAAQ,wBAAiB;IAKhD;IAHrB,YACI,KAA4C,EAC5C,KAAwB,EACP,IAAiB;QAElC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAFH,SAAI,GAAJ,IAAI,CAAa;IAGtC,CAAC;IAEQ,KAAK,CAAC,OAAO,CAAC,QAAkB;QACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAE9B,CAAC;QAEF,oEAAoE;QACpE,2DAA2D;QAC3D,MAAM,eAAe,GAAG,QAAQ,CAAC,QAAQ,CAAC;QAC1C,QAAQ,CAAC,QAAQ,GAAG,CAAC,IAAsB,EAAE,EAAE;YAE3C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YAC1C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAE1C,OAAO,eAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAChD,CAAC,CAAA;QAED,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAChB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EACrB,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAChC,CAAC;QAEF,QAAQ,CAAC,QAAQ,GAAG,eAAe,CAAC;IACxC,CAAC;IAEO,YAAY,CAAC,QAAkB;QACnC,IAAI,QAAQ,YAAY,kBAAW,EAAE;YACjC,OAAO,IAAA,6BAAmB,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACvD,GAAG,CAAC,KAAK,CAAC,GAAG,IAAA,QAAC,EAAA,GAAI,QAAQ,CAAC,KAAK,CAAE,EAAE,CAAC;gBACrC,OAAO,GAAG,CAAC;YACf,CAAC,EAAE,EAAE,CAAC,CAAC;SACV;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAEO,UAAU,CAAC,QAAkB;QACjC,MAAM,qBAAqB,GAAG,QAAQ,CAAC,qBAAqB,EAAE,CAAC;QAC/D,OAAO;YACH,IAAI,EAAE,qBAAqB,CAAC,IAAI,CAAC,KAAK;YACtC,IAAI,EAAE,qBAAqB,CAAC,IAAI;YAChC,MAAM,EAAE,qBAAqB,CAAC,MAAM;SACvC,CAAC;IACN,CAAC;CACJ;AApDD,gFAoDC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serenity-js/playwright-test",
-  "version": "3.21.2",
+  "version": "3.22.0",
   "description": "Serenity/JS reporter and test APIs for Playwright Test",
   "author": {
     "name": "Jan Molak",
@@ -45,11 +45,11 @@
     "node": "^16.13 || ^18.12 || ^20"
   },
   "dependencies": {
-    "@playwright/test": "1.42.1",
-    "@serenity-js/core": "3.21.2",
-    "@serenity-js/playwright": "3.21.2",
-    "@serenity-js/rest": "3.21.2",
-    "@serenity-js/web": "3.21.2",
+    "@playwright/test": "1.43.0",
+    "@serenity-js/core": "3.22.0",
+    "@serenity-js/playwright": "3.22.0",
+    "@serenity-js/rest": "3.22.0",
+    "@serenity-js/web": "3.22.0",
     "deepmerge": "4.3.1",
     "tiny-types": "1.22.0"
   },
@@ -63,5 +63,5 @@
     "ts-node": "10.9.2",
     "typescript": "5.2.2"
   },
-  "gitHead": "a47e62917327ac59baaeb3e4f87d8bf8702f1510"
+  "gitHead": "28f90019515001a310e01aa484cbd27f533f9e89"
 }

package/src/api/PerformActivitiesAsPlaywrightSteps.ts

@@ -1,4 +1,4 @@
-import type { test as base } from '@playwright/test';
+import type { test as base, TestInfo } from '@playwright/test';
 import type { Activity, PerformsActivities } from '@serenity-js/core';
 import { d, Interaction, PerformActivities } from '@serenity-js/core';
 import type { EmitsDomainEvents } from '@serenity-js/core/lib/events';
@@ -15,19 +15,27 @@ export class PerformActivitiesAsPlaywrightSteps extends PerformActivities {
     }
 
     override async perform(activity: Activity): Promise<void> {
-        const testInfo = this.test.info();
+        const testInfo = this.test.info() as TestInfo & {
+            _addStep: (data: TestStepInternal) => TestStepInternal
+        };
+
+        // Monkey-patch addStep to allow for passing a pre-computed location
+        // see https://github.com/microsoft/playwright/issues/30160
+        const originalAddStep = testInfo._addStep;
+        testInfo._addStep = (data: TestStepInternal) => {
+
+            data.location = this.locationOf(activity);
+            data.params = this.parametersOf(activity);
+
+            return originalAddStep.call(testInfo, data);
+        }
 
-        // see https://github.com/microsoft/playwright/issues/23157
-        const runAsStep = (testInfo['_runAsStep']).bind(testInfo) as <T>(stepInfo: TestStepInternal, callback: (step: TestStepInternal) => Promise<T>) => Promise<T>;
+        await this.test.step(
+            this.nameOf(activity),
+            () => super.perform(activity),
+        );
 
-        return runAsStep({
-            category: 'test.step',
-            title: this.nameOf(activity),
-            location: this.locationOf(activity),
-            params: this.parametersOf(activity),
-        }, async step_ => {
-            await super.perform(activity)
-        })
+        testInfo._addStep = originalAddStep;
     }
 
     private parametersOf(activity: Activity): Record<string, any> {
@@ -50,6 +58,7 @@ export class PerformActivitiesAsPlaywrightSteps extends PerformActivities {
     }
 }
 
+// Partial copy of https://github.com/microsoft/playwright/blob/b5e36583f67745fddf32145fa2355e5f122c2903/packages/playwright/src/worker/testInfo.ts#L32
 interface TestStepInternal {
     title: string;
     category: string;