@serenity-js/webdriverio 3.41.2 → 3.42.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +13 -0
- package/esm/adapter/TestRunnerLoader.d.ts +3 -3
- package/esm/adapter/TestRunnerLoader.d.ts.map +1 -1
- package/esm/adapter/TestRunnerLoader.js +3 -3
- package/esm/adapter/TestRunnerLoader.js.map +1 -1
- package/esm/adapter/WebdriverIOFrameworkAdapter.d.ts +2 -2
- package/esm/adapter/WebdriverIOFrameworkAdapter.d.ts.map +1 -1
- package/esm/adapter/WebdriverIOFrameworkAdapter.js +1 -1
- package/esm/adapter/WebdriverIOFrameworkAdapter.js.map +1 -1
- package/esm/adapter/WebdriverIOFrameworkAdapterFactory.d.ts +1 -1
- package/esm/adapter/WebdriverIOFrameworkAdapterFactory.d.ts.map +1 -1
- package/esm/adapter/WebdriverIONotifier.d.ts +2 -2
- package/esm/adapter/WebdriverIONotifier.d.ts.map +1 -1
- package/esm/adapter/WebdriverIONotifier.js +2 -2
- package/esm/adapter/WebdriverIONotifier.js.map +1 -1
- package/esm/adapter/reporter/BrowserCapabilitiesReporter.js +1 -1
- package/esm/adapter/reporter/BrowserCapabilitiesReporter.js.map +1 -1
- package/esm/adapter/reporter/OutputStreamBuffer.d.ts +1 -1
- package/esm/adapter/reporter/OutputStreamBuffer.d.ts.map +1 -1
- package/esm/adapter/reporter/OutputStreamBufferPrinter.d.ts +2 -2
- package/esm/adapter/reporter/OutputStreamBufferPrinter.d.ts.map +1 -1
- package/esm/adapter/reporter/OutputStreamBufferPrinter.js +1 -1
- package/esm/adapter/reporter/OutputStreamBufferPrinter.js.map +1 -1
- package/esm/adapter/reporter/ProvidesWriteStream.d.ts +1 -1
- package/esm/adapter/reporter/ProvidesWriteStream.d.ts.map +1 -1
- package/esm/adapter/reporter/TagPrinter.d.ts +1 -1
- package/esm/adapter/reporter/TagPrinter.d.ts.map +1 -1
- package/esm/adapter/reporter/TagPrinter.js +1 -1
- package/esm/adapter/reporter/TagPrinter.js.map +1 -1
- package/esm/index.js +1 -1
- package/esm/index.js.map +1 -1
- package/esm/screenplay/models/WebdriverIOBrowsingSession.js +1 -1
- package/esm/screenplay/models/WebdriverIOBrowsingSession.js.map +1 -1
- package/esm/screenplay/models/WebdriverIOModalDialogHandler.d.ts +1 -1
- package/esm/screenplay/models/WebdriverIOModalDialogHandler.d.ts.map +1 -1
- package/esm/screenplay/models/WebdriverIOModalDialogHandler.js +16 -7
- package/esm/screenplay/models/WebdriverIOModalDialogHandler.js.map +1 -1
- package/esm/screenplay/models/WebdriverIOPage.d.ts +1 -1
- package/esm/screenplay/models/WebdriverIOPage.d.ts.map +1 -1
- package/esm/screenplay/models/WebdriverIOPage.js +16 -2
- package/esm/screenplay/models/WebdriverIOPage.js.map +1 -1
- package/esm/screenplay/models/WebdriverIOPageElement.d.ts.map +1 -1
- package/esm/screenplay/models/WebdriverIOPageElement.js +10 -1
- package/esm/screenplay/models/WebdriverIOPageElement.js.map +1 -1
- package/lib/adapter/TestRunnerLoader.d.ts +3 -3
- package/lib/adapter/TestRunnerLoader.d.ts.map +1 -1
- package/lib/adapter/TestRunnerLoader.js +7 -7
- package/lib/adapter/TestRunnerLoader.js.map +1 -1
- package/lib/adapter/WebdriverIOFrameworkAdapter.d.ts +2 -2
- package/lib/adapter/WebdriverIOFrameworkAdapter.d.ts.map +1 -1
- package/lib/adapter/WebdriverIOFrameworkAdapter.js +7 -7
- package/lib/adapter/WebdriverIOFrameworkAdapter.js.map +1 -1
- package/lib/adapter/WebdriverIOFrameworkAdapterFactory.d.ts +1 -1
- package/lib/adapter/WebdriverIOFrameworkAdapterFactory.d.ts.map +1 -1
- package/lib/adapter/WebdriverIONotifier.d.ts +2 -2
- package/lib/adapter/WebdriverIONotifier.d.ts.map +1 -1
- package/lib/adapter/WebdriverIONotifier.js +25 -25
- package/lib/adapter/WebdriverIONotifier.js.map +1 -1
- package/lib/adapter/reporter/BrowserCapabilitiesReporter.js +2 -2
- package/lib/adapter/reporter/BrowserCapabilitiesReporter.js.map +1 -1
- package/lib/adapter/reporter/OutputStreamBuffer.d.ts +1 -1
- package/lib/adapter/reporter/OutputStreamBuffer.d.ts.map +1 -1
- package/lib/adapter/reporter/OutputStreamBufferPrinter.d.ts +2 -2
- package/lib/adapter/reporter/OutputStreamBufferPrinter.d.ts.map +1 -1
- package/lib/adapter/reporter/OutputStreamBufferPrinter.js +2 -2
- package/lib/adapter/reporter/OutputStreamBufferPrinter.js.map +1 -1
- package/lib/adapter/reporter/ProvidesWriteStream.d.ts +1 -1
- package/lib/adapter/reporter/ProvidesWriteStream.d.ts.map +1 -1
- package/lib/adapter/reporter/TagPrinter.d.ts +1 -1
- package/lib/adapter/reporter/TagPrinter.d.ts.map +1 -1
- package/lib/adapter/reporter/TagPrinter.js +3 -3
- package/lib/adapter/reporter/TagPrinter.js.map +1 -1
- package/lib/index.js +2 -2
- package/lib/index.js.map +1 -1
- package/lib/screenplay/models/WebdriverIOBrowsingSession.js +9 -9
- package/lib/screenplay/models/WebdriverIOBrowsingSession.js.map +1 -1
- package/lib/screenplay/models/WebdriverIOModalDialogHandler.d.ts +1 -1
- package/lib/screenplay/models/WebdriverIOModalDialogHandler.d.ts.map +1 -1
- package/lib/screenplay/models/WebdriverIOModalDialogHandler.js +16 -7
- package/lib/screenplay/models/WebdriverIOModalDialogHandler.js.map +1 -1
- package/lib/screenplay/models/WebdriverIOPage.d.ts +1 -1
- package/lib/screenplay/models/WebdriverIOPage.d.ts.map +1 -1
- package/lib/screenplay/models/WebdriverIOPage.js +16 -2
- package/lib/screenplay/models/WebdriverIOPage.js.map +1 -1
- package/lib/screenplay/models/WebdriverIOPageElement.d.ts.map +1 -1
- package/lib/screenplay/models/WebdriverIOPageElement.js +10 -1
- package/lib/screenplay/models/WebdriverIOPageElement.js.map +1 -1
- package/package.json +23 -26
- package/src/adapter/TestRunnerLoader.ts +5 -5
- package/src/adapter/WebdriverIOFrameworkAdapter.ts +3 -3
- package/src/adapter/WebdriverIOFrameworkAdapterFactory.ts +1 -1
- package/src/adapter/WebdriverIONotifier.ts +4 -4
- package/src/adapter/reporter/BrowserCapabilitiesReporter.ts +2 -2
- package/src/adapter/reporter/OutputStreamBuffer.ts +1 -1
- package/src/adapter/reporter/OutputStreamBufferPrinter.ts +3 -3
- package/src/adapter/reporter/ProvidesWriteStream.ts +1 -1
- package/src/adapter/reporter/TagPrinter.ts +2 -2
- package/src/index.ts +1 -1
- package/src/screenplay/models/WebdriverIOBrowsingSession.ts +1 -1
- package/src/screenplay/models/WebdriverIOModalDialogHandler.ts +16 -8
- package/src/screenplay/models/WebdriverIOPage.ts +19 -3
- package/src/screenplay/models/WebdriverIOPageElement.ts +15 -1
- package/tsconfig-esm.build.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProvidesWriteStream.d.ts","sourceRoot":"","sources":["../../../src/adapter/reporter/ProvidesWriteStream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"ProvidesWriteStream.d.ts","sourceRoot":"","sources":["../../../src/adapter/reporter/ProvidesWriteStream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAChC,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,YAAY,CAAC;CACxD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TagPrinter.d.ts","sourceRoot":"","sources":["../../../src/adapter/reporter/TagPrinter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"TagPrinter.d.ts","sourceRoot":"","sources":["../../../src/adapter/reporter/TagPrinter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAEnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD;;GAEG;AACH,qBAAa,UAAU;IACnB,OAAO,CAAC,UAAU,EAAE,YAAY,CAAC,+BAA+B,GAAG,YAAY,CAAC,gCAAgC,GAAG,GAAG,EAAE;IASxH,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,mBAAmB;IAK3B,OAAO,CAAC,OAAO;IAMf,OAAO,CAAC,KAAK;CAGhB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TagPrinter = void 0;
|
|
4
|
-
const
|
|
4
|
+
const model_1 = require("@serenity-js/core/model");
|
|
5
5
|
/**
|
|
6
6
|
* @package
|
|
7
7
|
*/
|
|
@@ -14,10 +14,10 @@ class TagPrinter {
|
|
|
14
14
|
];
|
|
15
15
|
}
|
|
16
16
|
browserTagFor(capabilities) {
|
|
17
|
-
return new
|
|
17
|
+
return new model_1.BrowserTag(this.browserNameFrom(capabilities), this.browserVersionFrom(capabilities));
|
|
18
18
|
}
|
|
19
19
|
platformTagFor(capabilities) {
|
|
20
|
-
return new
|
|
20
|
+
return new model_1.PlatformTag(this.platformNameFrom(capabilities), this.platformVersionFrom(capabilities));
|
|
21
21
|
}
|
|
22
22
|
browserNameFrom(capabilities) {
|
|
23
23
|
return capabilities['browserName']
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TagPrinter.js","sourceRoot":"","sources":["../../../src/adapter/reporter/TagPrinter.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"TagPrinter.js","sourceRoot":"","sources":["../../../src/adapter/reporter/TagPrinter.ts"],"names":[],"mappings":";;;AACA,mDAAkE;AAGlE;;GAEG;AACH,MAAa,UAAU;IACnB,OAAO,CAAC,UAAwG;QAC5G,MAAM,mBAAmB,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAErD,OAAO;YACH,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC;YACvC,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC;SAC3C,CAAC;IACN,CAAC;IAEO,aAAa,CAAC,YAA0G;QAC5H,OAAO,IAAI,kBAAU,CACjB,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,EAClC,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,CACxC,CAAC;IACN,CAAC;IAEO,cAAc,CAAC,YAA0G;QAC7H,OAAO,IAAI,mBAAW,CAClB,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,EACnC,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,CACzC,CAAC;IACN,CAAC;IAEO,eAAe,CAAC,YAA0G;QAC9H,OAAO,YAAY,CAAC,aAAa,CAAC;eAC3B,YAAY,CAAC,SAAS,CAAC;eACvB,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,YAAY,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;eACxF,SAAS,CAAC;IACrB,CAAC;IAEO,kBAAkB,CAAC,YAA0G;QACjI,OAAO,YAAY,CAAC,YAAY,CAAC,CAAU,aAAa;eACjD,YAAY,CAAC,mBAAmB,CAAC;eACjC,YAAY,CAAC,gBAAgB,CAAC,CAAM,aAAa;eACjD,YAAY,CAAC,SAAS,CAAC,CAAa,gBAAgB;eACpD,YAAY,CAAC,iBAAiB,CAAC,CAAC,CAAI,eAAe;IAC9D,CAAC;IAEO,gBAAgB,CAAC,YAA0G;QAC/H,OAAO,YAAY,CAAC,cAAc,CAAC;eAC5B,YAAY,CAAC,qBAAqB,CAAC;eACnC,YAAY,CAAC,UAAU,CAAC;eACxB,YAAY,CAAC,IAAI,CAAC;eAClB,SAAS,CAAC;IACrB,CAAC;IAEO,mBAAmB,CAAC,YAA0G;QAClI,OAAO,YAAY,CAAC,wBAAwB,CAAC;eACtC,YAAY,CAAC,YAAY,CAAC,CAAC;IACtC,CAAC;IAEO,OAAO,CAAC,YAA0G;QACtH,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;YAC3B,CAAC,CAAC,YAAY,CAAC,WAAW;YAC1B,CAAC,CAAC,YAAY,CAAC;IACvB,CAAC;IAEO,KAAK,CAAC,YAA0G;QACpH,OAAO,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC;IAChD,CAAC;CACJ;AA7DD,gCA6DC"}
|
package/lib/index.js
CHANGED
|
@@ -37,14 +37,14 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
const core_1 = require("@serenity-js/core");
|
|
40
|
-
const
|
|
40
|
+
const io_1 = require("@serenity-js/core/io");
|
|
41
41
|
/**
|
|
42
42
|
* WebdriverIO Framework Adapter integrates WebdriverIO with Serenity/JS
|
|
43
43
|
*/
|
|
44
44
|
exports.default = {
|
|
45
45
|
async init(cid, config, specs, capabilities, reporter) {
|
|
46
46
|
const { WebdriverIOFrameworkAdapterFactory } = await Promise.resolve().then(() => __importStar(require('./adapter/index.js')));
|
|
47
|
-
const adapterFactory = new WebdriverIOFrameworkAdapterFactory(core_1.serenity, new
|
|
47
|
+
const adapterFactory = new WebdriverIOFrameworkAdapterFactory(core_1.serenity, new io_1.ModuleLoader(process.cwd()), io_1.Path.from(process.cwd()));
|
|
48
48
|
return adapterFactory.init(cid, config, specs, capabilities, reporter);
|
|
49
49
|
}
|
|
50
50
|
};
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAA6C;AAC7C,6CAA0D;AAO1D;;GAEG;AACH,kBAAe;IACX,KAAK,CAAC,IAAI,CACN,GAAW,EACX,MAAyB,EACzB,KAAe,EACf,YAA6M,EAC7M,QAAmE;QAEnE,MAAM,EAAE,kCAAkC,EAAE,GAAG,wDAAa,oBAAoB,GAAC,CAAC;QAElF,MAAM,cAAc,GAAG,IAAI,kCAAkC,CACzD,eAAQ,EACR,IAAI,iBAAY,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAC/B,SAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAC3B,CAAC;QAEF,OAAO,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;IAC3E,CAAC;CACJ,CAAC;AAEF,2CAAyB"}
|
|
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.WebdriverIOBrowsingSession = void 0;
|
|
4
4
|
require("webdriverio");
|
|
5
5
|
const core_1 = require("@serenity-js/core");
|
|
6
|
-
const
|
|
6
|
+
const model_1 = require("@serenity-js/core/model");
|
|
7
7
|
const web_1 = require("@serenity-js/web");
|
|
8
|
-
const
|
|
8
|
+
const index_js_1 = require("../models/index.js");
|
|
9
9
|
const WebdriverIOErrorHandler_js_1 = require("./WebdriverIOErrorHandler.js");
|
|
10
10
|
const WebdriverIOModalDialogHandler_js_1 = require("./WebdriverIOModalDialogHandler.js");
|
|
11
11
|
const WebdriverProtocolErrorCode_js_1 = require("./WebdriverProtocolErrorCode.js");
|
|
@@ -37,7 +37,7 @@ class WebdriverIOBrowsingSession extends web_1.BrowsingSession {
|
|
|
37
37
|
const modalDialogHandler = new WebdriverIOModalDialogHandler_js_1.WebdriverIOModalDialogHandler(this.browser);
|
|
38
38
|
const errorHandler = new WebdriverIOErrorHandler_js_1.WebdriverIOErrorHandler();
|
|
39
39
|
errorHandler.setHandlerFor(WebdriverProtocolErrorCode_js_1.WebdriverProtocolErrorCode.UnexpectedAlertOpenError, error => modalDialogHandler.dismiss());
|
|
40
|
-
this.register(new
|
|
40
|
+
this.register(new index_js_1.WebdriverIOPage(this, this.browser, modalDialogHandler, errorHandler, new model_1.CorrelationId(newlyOpenedWindowHandle)));
|
|
41
41
|
}
|
|
42
42
|
return super.allPages();
|
|
43
43
|
}
|
|
@@ -78,7 +78,7 @@ class WebdriverIOBrowsingSession extends web_1.BrowsingSession {
|
|
|
78
78
|
}
|
|
79
79
|
async currentPage() {
|
|
80
80
|
const actualCurrentPageHandle = await this.activeWindowHandle();
|
|
81
|
-
const actualCurrentPageId =
|
|
81
|
+
const actualCurrentPageId = model_1.CorrelationId.fromJSON(actualCurrentPageHandle);
|
|
82
82
|
if (this.currentBrowserPage && this.currentBrowserPage.id.equals(actualCurrentPageId)) {
|
|
83
83
|
return this.currentBrowserPage;
|
|
84
84
|
}
|
|
@@ -99,7 +99,7 @@ class WebdriverIOBrowsingSession extends web_1.BrowsingSession {
|
|
|
99
99
|
const modalDialogHandler = new WebdriverIOModalDialogHandler_js_1.WebdriverIOModalDialogHandler(this.browser);
|
|
100
100
|
const errorHandler = new WebdriverIOErrorHandler_js_1.WebdriverIOErrorHandler();
|
|
101
101
|
errorHandler.setHandlerFor(WebdriverProtocolErrorCode_js_1.WebdriverProtocolErrorCode.UnexpectedAlertOpenError, error => modalDialogHandler.dismiss());
|
|
102
|
-
const page = new
|
|
102
|
+
const page = new index_js_1.WebdriverIOPage(this, this.browser, modalDialogHandler, errorHandler, pageId);
|
|
103
103
|
this.register(page);
|
|
104
104
|
return page;
|
|
105
105
|
}
|
|
@@ -107,17 +107,17 @@ class WebdriverIOBrowsingSession extends web_1.BrowsingSession {
|
|
|
107
107
|
if (this.browser.isMobile) {
|
|
108
108
|
const context = await this.browser.getContext();
|
|
109
109
|
if (typeof context === 'string') {
|
|
110
|
-
return new
|
|
110
|
+
return new model_1.CorrelationId(context);
|
|
111
111
|
}
|
|
112
112
|
if (context.id) {
|
|
113
|
-
return new
|
|
113
|
+
return new model_1.CorrelationId(context.id);
|
|
114
114
|
}
|
|
115
115
|
}
|
|
116
116
|
if (this.browser['getWindowHandle']) {
|
|
117
117
|
const handle = await this.browser.getWindowHandle();
|
|
118
|
-
return new
|
|
118
|
+
return new model_1.CorrelationId(handle);
|
|
119
119
|
}
|
|
120
|
-
return
|
|
120
|
+
return model_1.CorrelationId.create();
|
|
121
121
|
}
|
|
122
122
|
browserCapabilities() {
|
|
123
123
|
return Promise.resolve(this.browser.capabilities);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebdriverIOBrowsingSession.js","sourceRoot":"","sources":["../../../src/screenplay/models/WebdriverIOBrowsingSession.ts"],"names":[],"mappings":";;;AAAA,uBAAqB;AAErB,4CAAiE;AACjE,
|
|
1
|
+
{"version":3,"file":"WebdriverIOBrowsingSession.js","sourceRoot":"","sources":["../../../src/screenplay/models/WebdriverIOBrowsingSession.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ export declare class WebdriverIOModalDialogHandler extends ModalDialogHandler im
|
|
|
11
11
|
private readonly browser;
|
|
12
12
|
private readonly defaultHandler;
|
|
13
13
|
private currentHandler;
|
|
14
|
-
private
|
|
14
|
+
private pendingDialogHandling;
|
|
15
15
|
constructor(browser: WebdriverIO.Browser);
|
|
16
16
|
private onDialog;
|
|
17
17
|
private tryToHandleDialog;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebdriverIOModalDialogHandler.d.ts","sourceRoot":"","sources":["../../../src/screenplay/models/WebdriverIOModalDialogHandler.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,CAAC;AAErB,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAgE,KAAK,WAAW,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAItI;;;;;GAKG;AACH,qBAAa,6BAA8B,SAAQ,kBAAmB,YAAW,WAAW;IAc5E,OAAO,CAAC,QAAQ,CAAC,OAAO;IAZpC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAO1B;IAEL,OAAO,CAAC,cAAc,CAAgD;IACtE,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"WebdriverIOModalDialogHandler.d.ts","sourceRoot":"","sources":["../../../src/screenplay/models/WebdriverIOModalDialogHandler.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,CAAC;AAErB,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAgE,KAAK,WAAW,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAItI;;;;;GAKG;AACH,qBAAa,6BAA8B,SAAQ,kBAAmB,YAAW,WAAW;IAc5E,OAAO,CAAC,QAAQ,CAAC,OAAO;IAZpC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAO1B;IAEL,OAAO,CAAC,cAAc,CAAgD;IACtE,OAAO,CAAC,qBAAqB,CAAoC;gBAEpC,OAAO,EAAE,WAAW,CAAC,OAAO;IAQzD,OAAO,CAAC,QAAQ,CAEd;YAEY,iBAAiB;IAmBzB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAU3B,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASzD,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAU5B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAexB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC;IAK5B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAGjC"}
|
|
@@ -18,14 +18,16 @@ class WebdriverIOModalDialogHandler extends web_1.ModalDialogHandler {
|
|
|
18
18
|
this.modalDialog = new web_1.DismissedModalDialog(message);
|
|
19
19
|
};
|
|
20
20
|
currentHandler;
|
|
21
|
-
|
|
21
|
+
pendingDialogHandling = Promise.resolve();
|
|
22
22
|
constructor(browser) {
|
|
23
23
|
super();
|
|
24
24
|
this.browser = browser;
|
|
25
25
|
this.currentHandler = this.defaultHandler;
|
|
26
26
|
this.browser.on('dialog', this.onDialog);
|
|
27
27
|
}
|
|
28
|
-
onDialog =
|
|
28
|
+
onDialog = (dialog) => {
|
|
29
|
+
this.pendingDialogHandling = this.tryToHandleDialog(dialog);
|
|
30
|
+
};
|
|
29
31
|
async tryToHandleDialog(dialog) {
|
|
30
32
|
try {
|
|
31
33
|
await this.currentHandler(dialog);
|
|
@@ -64,12 +66,18 @@ class WebdriverIOModalDialogHandler extends web_1.ModalDialogHandler {
|
|
|
64
66
|
};
|
|
65
67
|
}
|
|
66
68
|
async dismiss() {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
+
try {
|
|
70
|
+
const message = await this.browser.getAlertText();
|
|
71
|
+
await this.browser.dismissAlert();
|
|
72
|
+
this.modalDialog = new web_1.DismissedModalDialog(message);
|
|
73
|
+
}
|
|
74
|
+
catch (error) {
|
|
75
|
+
// Dialog might have already been handled by the event listener
|
|
76
|
+
if (error.message?.includes(WebdriverProtocolErrorCode_js_1.WebdriverProtocolErrorCode.NoSuchAlertError)) {
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
throw error;
|
|
69
80
|
}
|
|
70
|
-
const message = this.dialog.message();
|
|
71
|
-
await this.dialog.dismiss();
|
|
72
|
-
this.modalDialog = new web_1.DismissedModalDialog(message);
|
|
73
81
|
}
|
|
74
82
|
async reset() {
|
|
75
83
|
this.modalDialog = new web_1.AbsentModalDialog();
|
|
@@ -79,6 +87,7 @@ class WebdriverIOModalDialogHandler extends web_1.ModalDialogHandler {
|
|
|
79
87
|
* @override
|
|
80
88
|
*/
|
|
81
89
|
async last() {
|
|
90
|
+
await this.pendingDialogHandling;
|
|
82
91
|
return this.modalDialog;
|
|
83
92
|
}
|
|
84
93
|
async discard() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebdriverIOModalDialogHandler.js","sourceRoot":"","sources":["../../../src/screenplay/models/WebdriverIOModalDialogHandler.ts"],"names":[],"mappings":";;;AAAA,uBAAqB;AAGrB,0CAAsI;AAEtI,mFAA6E;AAE7E;;;;;GAKG;AACH,MAAa,6BAA8B,SAAQ,wBAAkB;IAcpC;IAZZ,cAAc,GAC3B,KAAK,EAAE,MAA0B,EAAE,EAAE;QACjC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAEjC,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;QAEvB,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAoB,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC,CAAA;IAEG,cAAc,CAAgD;IAC9D,
|
|
1
|
+
{"version":3,"file":"WebdriverIOModalDialogHandler.js","sourceRoot":"","sources":["../../../src/screenplay/models/WebdriverIOModalDialogHandler.ts"],"names":[],"mappings":";;;AAAA,uBAAqB;AAGrB,0CAAsI;AAEtI,mFAA6E;AAE7E;;;;;GAKG;AACH,MAAa,6BAA8B,SAAQ,wBAAkB;IAcpC;IAZZ,cAAc,GAC3B,KAAK,EAAE,MAA0B,EAAE,EAAE;QACjC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAEjC,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;QAEvB,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAoB,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC,CAAA;IAEG,cAAc,CAAgD;IAC9D,qBAAqB,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;IAEjE,YAA6B,OAA4B;QACrD,KAAK,EAAE,CAAC;QADiB,YAAO,GAAP,OAAO,CAAqB;QAGrD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QAE1C,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC7C,CAAC;IAEO,QAAQ,GAAG,CAAC,MAA0B,EAAE,EAAE;QAC9C,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAChE,CAAC,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,MAA0B;QACtD,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC;QACD,OAAM,KAAK,EAAE,CAAC;YACV,IAAI,KAAK,CAAC,IAAI,KAAK,0DAA0B,CAAC,wBAAwB,EAAE,CAAC;gBACrE,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;gBACvB,OAAO;YACX,CAAC;YAED,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,0DAA0B,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBACtE,IAAI,CAAC,WAAW,GAAG,IAAI,uBAAiB,EAAE,CAAC;gBAC3C,OAAO;YACX,CAAC;YAED,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU;QACZ,IAAI,CAAC,cAAc,GAAG,KAAK,EAAE,MAA0B,EAAE,EAAE;YACvD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;YAEjC,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAEjC,IAAI,CAAC,WAAW,GAAG,IAAI,yBAAmB,CAAC,OAAO,CAAC,CAAC;QACxD,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,IAAqB;QAC3C,IAAI,CAAC,cAAc,GAAG,KAAK,EAAE,MAA0B,EAAE,EAAE;YACvD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;YACjC,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;YAEjC,IAAI,CAAC,WAAW,GAAG,IAAI,yBAAmB,CAAC,OAAO,CAAC,CAAC;QACxD,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,WAAW;QACb,IAAI,CAAC,cAAc,GAAG,KAAK,EAAE,MAA0B,EAAE,EAAE;YACvD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;YAEjC,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;YAEvB,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAoB,CAAC,OAAO,CAAC,CAAC;QACzD,CAAC,CAAA;IACL,CAAC;IAED,KAAK,CAAC,OAAO;QACT,IAAI,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;YAClD,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;YAClC,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAoB,CAAC,OAAO,CAAC,CAAC;QACzD,CAAC;QACD,OAAO,KAAK,EAAE,CAAC;YACX,+DAA+D;YAC/D,IAAI,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,0DAA0B,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBACvE,OAAO;YACX,CAAC;YACD,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,CAAC,WAAW,GAAG,IAAI,uBAAiB,EAAE,CAAC;QAC3C,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;IAC9C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,IAAI;QACN,MAAM,IAAI,CAAC,qBAAqB,CAAC;QACjC,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,OAAO;QACT,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;CACJ;AAzGD,sEAyGC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import 'webdriverio';
|
|
2
2
|
import { URL } from 'node:url';
|
|
3
3
|
import { type Discardable } from '@serenity-js/core';
|
|
4
|
-
import type { CorrelationId } from '@serenity-js/core/
|
|
4
|
+
import type { CorrelationId } from '@serenity-js/core/model';
|
|
5
5
|
import type { Cookie, CookieData, ModalDialogHandler, PageElements, Selector } from '@serenity-js/web';
|
|
6
6
|
import { Key, Page, PageElement } from '@serenity-js/web';
|
|
7
7
|
import type { WebdriverIOBrowsingSession } from './WebdriverIOBrowsingSession.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebdriverIOPage.d.ts","sourceRoot":"","sources":["../../../src/screenplay/models/WebdriverIOPage.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,CAAC;AAErB,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAE/B,OAAO,EAAE,KAAK,WAAW,EAAoB,MAAM,mBAAmB,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"WebdriverIOPage.d.ts","sourceRoot":"","sources":["../../../src/screenplay/models/WebdriverIOPage.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,7 +38,7 @@ require("webdriverio");
|
|
|
38
38
|
const node_url_1 = require("node:url");
|
|
39
39
|
const core_1 = require("@serenity-js/core");
|
|
40
40
|
const web_1 = require("@serenity-js/web");
|
|
41
|
-
const scripts = __importStar(require("@serenity-js/web/
|
|
41
|
+
const scripts = __importStar(require("@serenity-js/web/scripts"));
|
|
42
42
|
const index_js_1 = require("./locators/index.js");
|
|
43
43
|
const WebdriverIOCookie_js_1 = require("./WebdriverIOCookie.js");
|
|
44
44
|
const WebdriverIOPageElement_js_1 = require("./WebdriverIOPageElement.js");
|
|
@@ -201,7 +201,21 @@ class WebdriverIOPage extends web_1.Page {
|
|
|
201
201
|
}
|
|
202
202
|
async setViewportSize(size) {
|
|
203
203
|
return await this.inContextOfThisPage(async () => {
|
|
204
|
-
|
|
204
|
+
// Use BiDi setViewport when available as it handles devicePixelRatio correctly
|
|
205
|
+
if (this.browser.isBidi) {
|
|
206
|
+
return this.browser.setViewport(size);
|
|
207
|
+
}
|
|
208
|
+
// Fall back to classic WebDriver approach for non-BiDi sessions
|
|
209
|
+
const desiredWindowSize = await this.browser.execute(`
|
|
210
|
+
var currentViewportWidth = Math.max(document.documentElement.clientWidth, window.innerWidth || 0)
|
|
211
|
+
var currentViewportHeight = Math.max(document.documentElement.clientHeight, window.innerHeight || 0)
|
|
212
|
+
|
|
213
|
+
return {
|
|
214
|
+
width: Math.max(window.outerWidth - currentViewportWidth + ${size.width}, ${size.width}),
|
|
215
|
+
height: Math.max(window.outerHeight - currentViewportHeight + ${size.height}, ${size.height}),
|
|
216
|
+
};
|
|
217
|
+
`);
|
|
218
|
+
return this.browser.setWindowSize(desiredWindowSize.width, desiredWindowSize.height);
|
|
205
219
|
});
|
|
206
220
|
}
|
|
207
221
|
async close() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebdriverIOPage.js","sourceRoot":"","sources":["../../../src/screenplay/models/WebdriverIOPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uBAAqB;AAErB,uCAA+B;AAE/B,4CAAuE;AAGvE,0CAQ0B;AAC1B
|
|
1
|
+
{"version":3,"file":"WebdriverIOPage.js","sourceRoot":"","sources":["../../../src/screenplay/models/WebdriverIOPage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebdriverIOPageElement.d.ts","sourceRoot":"","sources":["../../../src/screenplay/models/WebdriverIOPageElement.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,CAAC;AAGrB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAO,WAAW,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAMlE;;;;GAIG;AACH,qBAAa,sBAAuB,SAAQ,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC;IACxE,EAAE,CAAC,MAAM,EAAE,sBAAsB,GAAG,sBAAsB;IAI1D,SAAS,CAAC,KAAK,EAAE,sBAAsB,GAAG,sBAAsB;IAI1D,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAsC3B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAKtB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAO1E,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAK/B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAK1B,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAK3B,aAAa,CAAC,GAAG,OAAO,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAaxD,eAAe,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IA4B1C,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBpE,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKxC,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;IAKvB,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"WebdriverIOPageElement.d.ts","sourceRoot":"","sources":["../../../src/screenplay/models/WebdriverIOPageElement.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,CAAC;AAGrB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAO,WAAW,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAMlE;;;;GAIG;AACH,qBAAa,sBAAuB,SAAQ,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC;IACxE,EAAE,CAAC,MAAM,EAAE,sBAAsB,GAAG,sBAAsB;IAI1D,SAAS,CAAC,KAAK,EAAE,sBAAsB,GAAG,sBAAsB;IAI1D,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAsC3B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAKtB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAO1E,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAK/B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAK1B,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAK3B,aAAa,CAAC,GAAG,OAAO,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAaxD,eAAe,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IA4B1C,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBpE,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKxC,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;IAKvB,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IAmBxB,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;IAKvB,QAAQ,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAwDrC,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAK5B,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAK/B,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAK7B,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAK7B,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAK9B,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;YA4BrB,UAAU;CAM3B"}
|
|
@@ -37,7 +37,7 @@ exports.WebdriverIOPageElement = void 0;
|
|
|
37
37
|
require("webdriverio");
|
|
38
38
|
const core_1 = require("@serenity-js/core");
|
|
39
39
|
const web_1 = require("@serenity-js/web");
|
|
40
|
-
const scripts = __importStar(require("@serenity-js/web/
|
|
40
|
+
const scripts = __importStar(require("@serenity-js/web/scripts"));
|
|
41
41
|
const WebdriverProtocolErrorCode_js_1 = require("./WebdriverProtocolErrorCode.js");
|
|
42
42
|
/**
|
|
43
43
|
* WebdriverIO-specific implementation of [`PageElement`](https://serenity-js.org/api/web/class/PageElement/).
|
|
@@ -164,6 +164,15 @@ class WebdriverIOPageElement extends web_1.PageElement {
|
|
|
164
164
|
}
|
|
165
165
|
async value() {
|
|
166
166
|
const element = await this.nativeElement();
|
|
167
|
+
const browser = await this.browserFor(element);
|
|
168
|
+
// WebdriverIO v9 returns empty string for non-input elements instead of throwing
|
|
169
|
+
// Check if element actually supports the value property
|
|
170
|
+
const hasValueProperty = await browser.execute(
|
|
171
|
+
/* c8 ignore next */
|
|
172
|
+
(element_) => 'value' in element_, element);
|
|
173
|
+
if (!hasValueProperty) {
|
|
174
|
+
return undefined;
|
|
175
|
+
}
|
|
167
176
|
return await element.getValue();
|
|
168
177
|
}
|
|
169
178
|
async html() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebdriverIOPageElement.js","sourceRoot":"","sources":["../../../src/screenplay/models/WebdriverIOPageElement.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uBAAqB;AAErB,4CAA+C;AAE/C,0CAAkE;AAClE
|
|
1
|
+
{"version":3,"file":"WebdriverIOPageElement.js","sourceRoot":"","sources":["../../../src/screenplay/models/WebdriverIOPageElement.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serenity-js/webdriverio",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.42.0",
|
|
4
4
|
"description": "Adapter that integrates @serenity-js/web with the latest stable version of WebdriverIO, enabling Serenity/JS reporting and using the Screenplay Pattern to write web and mobile test scenarios",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Jan Molak",
|
|
@@ -21,14 +21,11 @@
|
|
|
21
21
|
"type": "module",
|
|
22
22
|
"module": "./esm/index.js",
|
|
23
23
|
"exports": {
|
|
24
|
-
".":
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
},
|
|
30
|
-
"./lib/index.js"
|
|
31
|
-
],
|
|
24
|
+
".": {
|
|
25
|
+
"types": "./esm/index.d.ts",
|
|
26
|
+
"import": "./esm/index.js",
|
|
27
|
+
"require": "./lib/index.js"
|
|
28
|
+
},
|
|
32
29
|
"./package.json": "./package.json"
|
|
33
30
|
},
|
|
34
31
|
"keywords": [
|
|
@@ -56,11 +53,11 @@
|
|
|
56
53
|
"clean": "rimraf target",
|
|
57
54
|
"test": "c8 npm run test:no-coverage",
|
|
58
55
|
"test:no-coverage": "mocha --config .mocharc.yml --spec='spec/**/*.spec.*'",
|
|
59
|
-
"compile": "npm run compile:clean && npm run compile:esm && npm run compile:cjs && npm run compile:cjs
|
|
56
|
+
"compile": "npm run compile:clean && npm run compile:esm && npm run compile:cjs-package && npm run compile:cjs",
|
|
60
57
|
"compile:clean": "rimraf lib esm",
|
|
61
58
|
"compile:esm": "tsc --project tsconfig-esm.build.json",
|
|
62
|
-
"compile:cjs": "
|
|
63
|
-
"compile:cjs
|
|
59
|
+
"compile:cjs-package": "node -e \"require('fs').mkdirSync('lib', { recursive: true }); require('fs').writeFileSync('lib/package.json', '{ \\\"type\\\": \\\"commonjs\\\" }')\"",
|
|
60
|
+
"compile:cjs": "tsc --project tsconfig-cjs.build.json"
|
|
64
61
|
},
|
|
65
62
|
"repository": {
|
|
66
63
|
"type": "git",
|
|
@@ -74,19 +71,19 @@
|
|
|
74
71
|
"node": "^20 || ^22 || ^24"
|
|
75
72
|
},
|
|
76
73
|
"dependencies": {
|
|
77
|
-
"@serenity-js/core": "3.
|
|
78
|
-
"@serenity-js/rest": "3.
|
|
79
|
-
"@serenity-js/web": "3.
|
|
80
|
-
"@wdio/reporter": "9.
|
|
74
|
+
"@serenity-js/core": "3.42.0",
|
|
75
|
+
"@serenity-js/rest": "3.42.0",
|
|
76
|
+
"@serenity-js/web": "3.42.0",
|
|
77
|
+
"@wdio/reporter": "9.26.1",
|
|
81
78
|
"deepmerge": "4.3.1",
|
|
82
|
-
"tiny-types": "
|
|
79
|
+
"tiny-types": "2.0.5"
|
|
83
80
|
},
|
|
84
81
|
"peerDependencies": {
|
|
85
82
|
"@serenity-js/cucumber": "^3.0.0",
|
|
86
83
|
"@serenity-js/jasmine": "^3.0.0",
|
|
87
84
|
"@serenity-js/mocha": "^3.0.0",
|
|
88
|
-
"@wdio/cli": "^9.
|
|
89
|
-
"webdriverio": "^9.
|
|
85
|
+
"@wdio/cli": "^9.26.1",
|
|
86
|
+
"webdriverio": "^9.26.1"
|
|
90
87
|
},
|
|
91
88
|
"peerDependenciesMeta": {
|
|
92
89
|
"@serenity-js/cucumber": {
|
|
@@ -102,11 +99,11 @@
|
|
|
102
99
|
"devDependencies": {
|
|
103
100
|
"@integration/testing-tools": "3.0.0",
|
|
104
101
|
"@types/mocha": "10.0.10",
|
|
105
|
-
"@wdio/cli": "9.
|
|
106
|
-
"@wdio/dot-reporter": "9.
|
|
107
|
-
"@wdio/local-runner": "9.
|
|
108
|
-
"@wdio/spec-reporter": "9.
|
|
109
|
-
"@wdio/types": "9.
|
|
102
|
+
"@wdio/cli": "9.26.1",
|
|
103
|
+
"@wdio/dot-reporter": "9.26.1",
|
|
104
|
+
"@wdio/local-runner": "9.26.1",
|
|
105
|
+
"@wdio/spec-reporter": "9.26.1",
|
|
106
|
+
"@wdio/types": "9.26.1",
|
|
110
107
|
"axios": "1.13.6",
|
|
111
108
|
"c8": "11.0.0",
|
|
112
109
|
"cross-env": "10.1.0",
|
|
@@ -114,7 +111,7 @@
|
|
|
114
111
|
"mocha-multi": "1.1.7",
|
|
115
112
|
"mocha-testdata": "1.2.0",
|
|
116
113
|
"start-server-and-test": "2.1.5",
|
|
117
|
-
"webdriverio": "9.
|
|
114
|
+
"webdriverio": "9.26.1"
|
|
118
115
|
},
|
|
119
|
-
"gitHead": "
|
|
116
|
+
"gitHead": "a415b0066807d7bab9f34b1ceef66a26156aafe1"
|
|
120
117
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ConfigurationError } from '@serenity-js/core';
|
|
2
|
-
import type { TestRunnerAdapter } from '@serenity-js/core/
|
|
3
|
-
import type { ModuleLoader} from '@serenity-js/core/
|
|
4
|
-
import { Config, FileFinder, FileSystem, Path } from '@serenity-js/core/
|
|
2
|
+
import type { TestRunnerAdapter } from '@serenity-js/core/adapter';
|
|
3
|
+
import type { ModuleLoader} from '@serenity-js/core/io';
|
|
4
|
+
import { Config, FileFinder, FileSystem, Path } from '@serenity-js/core/io';
|
|
5
5
|
|
|
6
6
|
import type { WebdriverIOConfig } from '../config/index.js';
|
|
7
7
|
|
|
@@ -42,7 +42,7 @@ export class TestRunnerLoader {
|
|
|
42
42
|
}
|
|
43
43
|
|
|
44
44
|
private cucumberAdapter(cucumberOptions?: TestRunnerOptions): TestRunnerAdapter {
|
|
45
|
-
const { CucumberCLIAdapter, CucumberFormat, StandardOutput, TempFileOutput } = this.loader.require('@serenity-js/cucumber/
|
|
45
|
+
const { CucumberCLIAdapter, CucumberFormat, StandardOutput, TempFileOutput } = this.loader.require('@serenity-js/cucumber/adapter');
|
|
46
46
|
|
|
47
47
|
delete cucumberOptions?.timeout; // todo: support setting a timeout via config?
|
|
48
48
|
delete cucumberOptions?.parallel; // WebdriverIO handles that already
|
|
@@ -84,7 +84,7 @@ export class TestRunnerLoader {
|
|
|
84
84
|
|
|
85
85
|
private mochaAdapter(mochaOptions: TestRunnerOptions): TestRunnerAdapter {
|
|
86
86
|
// todo: update path to mocha adapter too
|
|
87
|
-
const { MochaAdapter } = this.loader.require('@serenity-js/mocha/
|
|
87
|
+
const { MochaAdapter } = this.loader.require('@serenity-js/mocha/adapter')
|
|
88
88
|
return new MochaAdapter(mochaOptions, this.loader);
|
|
89
89
|
}
|
|
90
90
|
}
|
|
@@ -2,9 +2,9 @@ import 'webdriverio';
|
|
|
2
2
|
|
|
3
3
|
import type { Serenity } from '@serenity-js/core';
|
|
4
4
|
import { AnsiDiffFormatter, ArtifactArchiver, Cast, TakeNotes } from '@serenity-js/core';
|
|
5
|
-
import type { TestRunnerAdapter } from '@serenity-js/core/
|
|
6
|
-
import type { ModuleLoader } from '@serenity-js/core/
|
|
7
|
-
import { Path } from '@serenity-js/core/
|
|
5
|
+
import type { TestRunnerAdapter } from '@serenity-js/core/adapter';
|
|
6
|
+
import type { ModuleLoader } from '@serenity-js/core/io';
|
|
7
|
+
import { Path } from '@serenity-js/core/io';
|
|
8
8
|
import { CallAnApi } from '@serenity-js/rest';
|
|
9
9
|
import type { Capabilities } from '@wdio/types';
|
|
10
10
|
import * as deepmerge from 'deepmerge';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Serenity } from '@serenity-js/core';
|
|
2
|
-
import type { ModuleLoader, Path } from '@serenity-js/core/
|
|
2
|
+
import type { ModuleLoader, Path } from '@serenity-js/core/io';
|
|
3
3
|
import type { Capabilities } from '@wdio/types';
|
|
4
4
|
import type { EventEmitter } from 'events';
|
|
5
5
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Stage, StageCrewMember } from '@serenity-js/core';
|
|
2
2
|
import { LogicError } from '@serenity-js/core';
|
|
3
|
-
import type { DomainEvent } from '@serenity-js/core/
|
|
3
|
+
import type { DomainEvent } from '@serenity-js/core/events';
|
|
4
4
|
import {
|
|
5
5
|
AsyncOperationAttempted,
|
|
6
6
|
AsyncOperationCompleted,
|
|
@@ -10,8 +10,8 @@ import {
|
|
|
10
10
|
TestRunFinishes,
|
|
11
11
|
TestSuiteFinished,
|
|
12
12
|
TestSuiteStarts
|
|
13
|
-
} from '@serenity-js/core/
|
|
14
|
-
import type { Outcome, TestSuiteDetails } from '@serenity-js/core/
|
|
13
|
+
} from '@serenity-js/core/events';
|
|
14
|
+
import type { Outcome, TestSuiteDetails } from '@serenity-js/core/model';
|
|
15
15
|
import {
|
|
16
16
|
CorrelationId,
|
|
17
17
|
Description,
|
|
@@ -23,7 +23,7 @@ import {
|
|
|
23
23
|
ImplementationPending,
|
|
24
24
|
Name,
|
|
25
25
|
ProblemIndication
|
|
26
|
-
} from '@serenity-js/core/
|
|
26
|
+
} from '@serenity-js/core/model';
|
|
27
27
|
import type { Test as testStats } from '@wdio/reporter';
|
|
28
28
|
import type { Capabilities, Frameworks } from '@wdio/types';
|
|
29
29
|
import type { EventEmitter } from 'events';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Serenity } from '@serenity-js/core';
|
|
2
|
-
import { SceneTagged } from '@serenity-js/core/
|
|
3
|
-
import type { Tag } from '@serenity-js/core/
|
|
2
|
+
import { SceneTagged } from '@serenity-js/core/events';
|
|
3
|
+
import type { Tag } from '@serenity-js/core/model';
|
|
4
4
|
import Reporter from '@wdio/reporter';
|
|
5
5
|
import type { Capabilities, Options, Reporters } from '@wdio/types';
|
|
6
6
|
|