@serenity-js/webdriverio 3.0.0-rc.9 → 3.0.1

package/lib/screenplay/models/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -10,8 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./WebdriverIOBrowsingSession"), exports);
 __exportStar(require("./WebdriverIOCookie"), exports);
-__exportStar(require("./WebdriverIOModalDialog"), exports);
 __exportStar(require("./WebdriverIOPage"), exports);
 __exportStar(require("./WebdriverIOPageElement"), exports);
 //# sourceMappingURL=index.js.map

package/lib/screenplay/models/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/screenplay/models/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sDAAoC;AACpC,2DAAyC;AACzC,oDAAkC;AAClC,2DAAyC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/screenplay/models/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+DAA6C;AAC7C,sDAAoC;AACpC,oDAAkC;AAClC,2DAAyC"}

package/lib/screenplay/models/locators/WebdriverIOLocator.d.ts

@@ -1,9 +1,22 @@
-import { Locator, PageElement, Selector } from '@serenity-js/web';
+import { Locator, PageElement, RootLocator, Selector } from '@serenity-js/web';
 import * as wdio from 'webdriverio';
-import { WebdriverIONativeElementRoot } from './WebdriverIONativeElementRoot';
-export declare class WebdriverIOLocator<Selector_Type extends Selector> extends Locator<wdio.Element<'async'>, WebdriverIONativeElementRoot, Selector_Type> {
-    static createRootLocator<ST extends Selector>(browser: WebdriverIONativeElementRoot, selector: ST, webdriverioSelector: string): WebdriverIOLocator<ST>;
-    of(parent: WebdriverIOLocator<unknown>): Locator<wdio.Element<'async'>, WebdriverIONativeElementRoot, Selector_Type>;
+import { WebdriverIOErrorHandler } from '../WebdriverIOErrorHandler';
+/**
+ * WebdriverIO-specific implementation of {@apilink Locator}.
+ *
+ * @group Models
+ */
+export declare class WebdriverIOLocator extends Locator<wdio.Element<'async'>, string> {
+    private readonly errorHandler;
+    constructor(parent: RootLocator<wdio.Element<'async'>>, selector: Selector, errorHandler: WebdriverIOErrorHandler);
+    protected nativeSelector(): string;
+    isPresent(): Promise<boolean>;
+    nativeElement(): Promise<wdio.Element<'async'>>;
+    private resolveNativeElement;
+    allNativeElements(): Promise<Array<wdio.Element<'async'>>>;
+    of(parent: WebdriverIOLocator): Locator<wdio.Element<'async'>, string>;
+    locate(child: WebdriverIOLocator): Locator<wdio.Element<'async'>, string>;
     element(): PageElement<wdio.Element<'async'>>;
     allElements(): Promise<Array<PageElement<wdio.Element<'async'>>>>;
 }
+//# sourceMappingURL=WebdriverIOLocator.d.ts.map

package/lib/screenplay/models/locators/WebdriverIOLocator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WebdriverIOLocator.d.ts","sourceRoot":"","sources":["../../../../src/screenplay/models/locators/WebdriverIOLocator.ts"],"names":[],"mappings":"AACA,OAAO,EAAmE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAChJ,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAIrE;;;;GAIG;AACH,qBAAa,kBAAmB,SAAQ,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAKtE,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAF7B,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAC1C,QAAQ,EAAE,QAAQ,EACD,YAAY,EAAE,uBAAuB;IAM1D,SAAS,CAAC,cAAc,IAAI,MAAM;IA4B5B,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAU7B,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YASvC,oBAAoB;IAgB5B,iBAAiB,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAKhE,EAAE,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAItE,MAAM,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAIzE,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAIvC,WAAW,IAAI,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;CAc1E"}

package/lib/screenplay/models/locators/WebdriverIOLocator.js

@@ -1,22 +1,101 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebdriverIOLocator = void 0;
+const core_1 = require("@serenity-js/core");
 const web_1 = require("@serenity-js/web");
 const WebdriverIOPageElement_1 = require("../WebdriverIOPageElement");
+/**
+ * WebdriverIO-specific implementation of {@apilink Locator}.
+ *
+ * @group Models
+ */
 class WebdriverIOLocator extends web_1.Locator {
-    static createRootLocator(browser, selector, webdriverioSelector) {
-        return new WebdriverIOLocator(() => browser, selector, (root) => root.$(webdriverioSelector), (root) => root.$$(webdriverioSelector));
+    constructor(parent, selector, errorHandler) {
+        super(parent, selector);
+        this.errorHandler = errorHandler;
+    }
+    // todo: refactor; replace with a map and some more generic lookup mechanism
+    nativeSelector() {
+        if (this.selector instanceof web_1.ByCss) {
+            return this.selector.value;
+        }
+        if (this.selector instanceof web_1.ByDeepCss) {
+            return `>>> ${this.selector.value}`;
+        }
+        if (this.selector instanceof web_1.ByCssContainingText) {
+            return `${this.selector.value}*=${this.selector.text}`;
+        }
+        if (this.selector instanceof web_1.ById) {
+            return `#${this.selector.value}`;
+        }
+        if (this.selector instanceof web_1.ByTagName) {
+            return `<${this.selector.value} />`;
+        }
+        if (this.selector instanceof web_1.ByXPath) {
+            return this.selector.value;
+        }
+        throw new core_1.LogicError((0, core_1.f) `${this.selector} is not supported by ${this.constructor.name}`);
+    }
+    async isPresent() {
+        try {
+            const element = await this.resolveNativeElement();
+            return Boolean(element);
+        }
+        catch {
+            return false;
+        }
+    }
+    async nativeElement() {
+        try {
+            return await this.resolveNativeElement();
+        }
+        catch (error) {
+            return await this.errorHandler.executeIfHandled(error, () => this.resolveNativeElement());
+        }
+    }
+    async resolveNativeElement() {
+        const parent = await this.parent.nativeElement();
+        if (parent.error) {
+            throw parent.error;
+        }
+        const element = await parent.$(this.nativeSelector());
+        if (element.error) {
+            throw element.error;
+        }
+        return element;
+    }
+    async allNativeElements() {
+        const parent = await this.parent.nativeElement();
+        return parent.$$(this.nativeSelector());
     }
     of(parent) {
-        return new WebdriverIOLocator(() => parent.nativeElement(), this.selector, (parentRoot) => this.locateElement(parentRoot), (parentRoot) => this.locateAllElements(parentRoot));
+        return new WebdriverIOLocator(parent, this.selector, this.errorHandler);
+    }
+    locate(child) {
+        return new WebdriverIOLocator(this, child.selector, this.errorHandler);
     }
     element() {
         return new WebdriverIOPageElement_1.WebdriverIOPageElement(this);
     }
     async allElements() {
-        const elements = await this.locateAllElements(await this.parentRoot());
-        return elements.map(childElement => new WebdriverIOPageElement_1.WebdriverIOPageElement(new WebdriverIOLocator(() => this.parentRoot(), this.selector, () => childElement, () => [childElement])));
+        const elements = await this.allNativeElements();
+        return elements.map(childElement => new WebdriverIOPageElement_1.WebdriverIOPageElement(new ExistingElementLocator(this.parent, this.selector, this.errorHandler, childElement)));
     }
 }
 exports.WebdriverIOLocator = WebdriverIOLocator;
+/**
+ * @private
+ */
+class ExistingElementLocator extends WebdriverIOLocator {
+    constructor(parentRoot, selector, errorHandler, existingNativeElement) {
+        super(parentRoot, selector, errorHandler);
+        this.existingNativeElement = existingNativeElement;
+    }
+    async nativeElement() {
+        return this.existingNativeElement;
+    }
+    async allNativeElements() {
+        return [this.existingNativeElement];
+    }
+}
 //# sourceMappingURL=WebdriverIOLocator.js.map

package/lib/screenplay/models/locators/WebdriverIOLocator.js.map

@@ -1 +1 @@
-{"version":3,"file":"WebdriverIOLocator.js","sourceRoot":"","sources":["../../../../src/screenplay/models/locators/WebdriverIOLocator.ts"],"names":[],"mappings":";;;AAAA,0CAAkE;AAGlE,sEAAmE;AAGnE,MAAa,kBAAmD,SAAQ,aAA2E;IAE/I,MAAM,CAAC,iBAAiB,CAAsB,OAAqC,EAAE,QAAY,EAAE,mBAA2B;QAC1H,OAAO,IAAI,kBAAkB,CACzB,GAAG,EAAE,CAAC,OAAO,EACb,QAAQ,EACR,CAAC,IAAkC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAqC,EACvG,CAAC,IAAkC,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,CACvE,CAAC;IACN,CAAC;IAED,EAAE,CAAC,MAAmC;QAClC,OAAO,IAAI,kBAAkB,CACzB,GAAG,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE,EAC5B,IAAI,CAAC,QAAQ,EACb,CAAC,UAAwC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,EAC5E,CAAC,UAAwC,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CACnF,CAAC;IACN,CAAC;IAED,OAAO;QACH,OAAO,IAAI,+CAAsB,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,WAAW;QACb,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAEvE,OAAO,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAC/B,IAAI,+CAAsB,CAAC,IAAI,kBAAkB,CAC7C,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,EACvB,IAAI,CAAC,QAAQ,EACb,GAAG,EAAE,CAAC,YAAY,EAClB,GAAG,EAAE,CAAC,CAAE,YAAY,CAAE,CACzB,CAAC,CACL,CAAC;IACN,CAAC;CACJ;AApCD,gDAoCC"}
+{"version":3,"file":"WebdriverIOLocator.js","sourceRoot":"","sources":["../../../../src/screenplay/models/locators/WebdriverIOLocator.ts"],"names":[],"mappings":"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"}

package/lib/screenplay/models/locators/WebdriverIORootLocator.d.ts

@@ -0,0 +1,17 @@
+import { RootLocator } from '@serenity-js/web';
+import * as wdio from 'webdriverio';
+/**
+ * WebdriverIO-specific implementation of {@apilink RootLocator}.
+ *
+ * @group Models
+ */
+export declare class WebdriverIORootLocator extends RootLocator<wdio.Browser<'async'>> {
+    private readonly browser;
+    constructor(browser: wdio.Browser<'async'>);
+    isPresent(): Promise<boolean>;
+    nativeElement(): Promise<Pick<wdio.Browser<'async'>, '$' | '$$'>>;
+    switchToFrame(frame: wdio.Element<'async'>): Promise<void>;
+    switchToParentFrame(): Promise<void>;
+    switchToMainFrame(): Promise<void>;
+}
+//# sourceMappingURL=WebdriverIORootLocator.d.ts.map

package/lib/screenplay/models/locators/WebdriverIORootLocator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WebdriverIORootLocator.d.ts","sourceRoot":"","sources":["../../../../src/screenplay/models/locators/WebdriverIORootLocator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AAEpC;;;;GAIG;AACH,qBAAa,sBAAuB,SAAQ,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9D,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IAIrD,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAI7B,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC,CAAC;IAIjE,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1D,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIpC,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;CAG3C"}

package/lib/screenplay/models/locators/WebdriverIORootLocator.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebdriverIORootLocator = void 0;
+const web_1 = require("@serenity-js/web");
+/**
+ * WebdriverIO-specific implementation of {@apilink RootLocator}.
+ *
+ * @group Models
+ */
+class WebdriverIORootLocator extends web_1.RootLocator {
+    constructor(browser) {
+        super();
+        this.browser = browser;
+    }
+    async isPresent() {
+        return true;
+    }
+    async nativeElement() {
+        return this.browser;
+    }
+    async switchToFrame(frame) {
+        await this.browser.switchToFrame(frame);
+    }
+    async switchToParentFrame() {
+        await this.browser.switchToParentFrame();
+    }
+    async switchToMainFrame() {
+        await this.browser.switchToFrame(null); // eslint-disable-line unicorn/no-null
+    }
+}
+exports.WebdriverIORootLocator = WebdriverIORootLocator;
+//# sourceMappingURL=WebdriverIORootLocator.js.map

package/lib/screenplay/models/locators/WebdriverIORootLocator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WebdriverIORootLocator.js","sourceRoot":"","sources":["../../../../src/screenplay/models/locators/WebdriverIORootLocator.ts"],"names":[],"mappings":";;;AAAA,0CAA+C;AAG/C;;;;GAIG;AACH,MAAa,sBAAuB,SAAQ,iBAAkC;IAC1E,YAA6B,OAA8B;QACvD,KAAK,EAAE,CAAC;QADiB,YAAO,GAAP,OAAO,CAAuB;IAE3D,CAAC;IAED,KAAK,CAAC,SAAS;QACX,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,aAAa;QACf,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAA4B;QAC5C,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,mBAAmB;QACrB,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,iBAAiB;QACnB,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,sCAAsC;IAClF,CAAC;CACJ;AAxBD,wDAwBC"}

package/lib/screenplay/models/locators/index.d.ts

@@ -1,2 +1,3 @@
 export * from './WebdriverIOLocator';
-export * from './WebdriverIONativeElementRoot';
+export * from './WebdriverIORootLocator';
+//# sourceMappingURL=index.d.ts.map

package/lib/screenplay/models/locators/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/screenplay/models/locators/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,0BAA0B,CAAC"}

package/lib/screenplay/models/locators/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -11,5 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./WebdriverIOLocator"), exports);
-__exportStar(require("./WebdriverIONativeElementRoot"), exports);
+__exportStar(require("./WebdriverIORootLocator"), exports);
 //# sourceMappingURL=index.js.map

package/lib/screenplay/models/locators/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/screenplay/models/locators/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAqC;AACrC,iEAA+C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/screenplay/models/locators/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAqC;AACrC,2DAAyC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serenity-js/webdriverio",
-  "version": "3.0.0-rc.9",
+  "version": "3.0.1",
   "description": "Serenity/JS reporter and Screenplay Pattern library for WebdriverIO",
   "author": {
     "name": "Jan Molak",
@@ -30,39 +30,36 @@
     "wdio-reporter"
   ],
   "scripts": {
-    "clean": "rimraf .nyc_output lib target",
-    "lint": "eslint --ext ts --config ../../.eslintrc.yml .",
-    "lint:fix": "npm run lint -- --fix",
-    "test": "nyc --report-dir ../../target/coverage/webdriverio/mocha mocha --config ../../.mocharc.yml 'spec/adapter/**/*.spec.*'",
-    "compile": "tsc --project tsconfig.json",
-    "site": "esdoc -c .esdoc.js"
+    "clean": "rimraf target",
+    "test": "nyc mocha --config ../../.mocharc.yml 'spec/adapter/**/*.spec.*'",
+    "compile": "rimraf lib && tsc --project tsconfig.build.json"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/serenity-js/serenity-js.git"
+    "url": "https://github.com/serenity-js/serenity-js.git",
+    "directory": "packages/webdriverio"
   },
   "bugs": {
     "url": "https://github.com/serenity-js/serenity-js/issues"
   },
   "engines": {
-    "node": "^14 || ^16",
-    "npm": "^6 || ^7 || ^8"
+    "node": "^14 || ^16 || ^18",
+    "npm": "^6 || ^7 || ^8 || ^9"
   },
   "dependencies": {
-    "@serenity-js/core": "3.0.0-rc.9",
-    "@serenity-js/web": "3.0.0-rc.9",
-    "@wdio/reporter": "^7.16.13",
-    "@wdio/types": "^7.16.13",
-    "deepmerge": "^4.2.2",
-    "is-plain-object": "^5.0.0",
-    "tiny-types": "^1.17.0"
+    "@serenity-js/core": "3.0.1",
+    "@serenity-js/web": "3.0.1",
+    "@wdio/reporter": "^7.30.2",
+    "@wdio/types": "^7.30.2",
+    "deepmerge": "^4.3.1",
+    "tiny-types": "^1.19.1"
   },
   "peerDependencies": {
     "@serenity-js/cucumber": "^3.0.0-rc",
     "@serenity-js/jasmine": "^3.0.0-rc",
     "@serenity-js/mocha": "^3.0.0-rc",
-    "@wdio/cli": "^7.16.13",
-    "webdriverio": "^7.16.13"
+    "@wdio/cli": "^7.30.2",
+    "webdriverio": "^7.30.2"
   },
   "peerDependenciesMeta": {
     "@serenity-js/cucumber": {
@@ -76,21 +73,23 @@
     }
   },
   "devDependencies": {
-    "@documentation/esdoc-template": "3.0.0",
     "@integration/testing-tools": "3.0.0",
-    "@types/mocha": "^9.0.0",
-    "@wdio/cli": "^7.16.13",
-    "@wdio/devtools-service": "^7.16.13",
-    "@wdio/dot-reporter": "^7.16.13",
-    "@wdio/local-runner": "^7.16.13",
-    "@wdio/mocha-framework": "^7.16.13",
-    "@wdio/spec-reporter": "^7.16.13",
-    "axios": "^0.21.4",
+    "@types/mocha": "^10.0.1",
+    "@wdio/cli": "^7.30.2",
+    "@wdio/devtools-service": "^7.30.2",
+    "@wdio/dot-reporter": "^7.30.2",
+    "@wdio/local-runner": "^7.30.2",
+    "@wdio/mocha-framework": "^7.30.2",
+    "@wdio/spec-reporter": "^7.30.2",
+    "axios": "^1.3.4",
     "cross-env": "^7.0.3",
-    "mocha": "^9.1.3",
+    "mocha": "^10.2.0",
+    "mocha-multi": "^1.1.7",
     "mocha-testdata": "^1.2.0",
-    "start-server-and-test": "^1.14.0",
-    "webdriverio": "^7.16.13"
+    "nyc": "15.1.0",
+    "puppeteer-core": "^19.8.0",
+    "start-server-and-test": "^2.0.0",
+    "webdriverio": "^7.30.2"
   },
   "nyc": {
     "include": [
@@ -112,5 +111,5 @@
     "cache": true,
     "all": false
   },
-  "gitHead": "bc72fce0831fe6c1e4e69d5ca307d7fb5f6d2f0d"
+  "gitHead": "349fca9fd7c9bb6467f615761344ac91c08a35db"
 }

package/src/adapter/TestRunnerLoader.ts

@@ -1,12 +1,10 @@
 import { ConfigurationError } from '@serenity-js/core';
-import { Config, FileFinder, FileSystem, ModuleLoader, Path, TestRunnerAdapter } from '@serenity-js/core/lib/io';
+import { TestRunnerAdapter } from '@serenity-js/core/lib/adapter';
+import { Config, FileFinder, FileSystem, ModuleLoader, Path } from '@serenity-js/core/lib/io';
 import { WebdriverIO } from '@wdio/types/build/Options';
 
 import { WebdriverIOConfig } from './WebdriverIOConfig';
 
-/**
- * @package
- */
 export class TestRunnerLoader {
     private readonly fileSystem: FileSystem;
     private readonly finder: FileFinder;
@@ -38,7 +36,7 @@ export class TestRunnerLoader {
     }
 
     private cucumberAdapter(cucumberOptions?: WebdriverIO.CucumberOpts): TestRunnerAdapter {
-        const { CucumberCLIAdapter, CucumberFormat, StandardOutput, TempFileOutput } = this.loader.require('@serenity-js/cucumber/lib/cli');
+        const { CucumberCLIAdapter, CucumberFormat, StandardOutput, TempFileOutput } = this.loader.require('@serenity-js/cucumber/lib/adapter');
 
         delete cucumberOptions?.timeout;   // todo: support setting a timeout via config?
         delete cucumberOptions?.parallel;  // WebdriverIO handles that already