@serenity-js/webdriverio 3.41.1 → 3.42.0

package/src/adapter/WebdriverIONotifier.ts

@@ -1,6 +1,6 @@
 import type { Stage, StageCrewMember } from '@serenity-js/core';
 import { LogicError } from '@serenity-js/core';
-import type { DomainEvent } from '@serenity-js/core/lib/events/index.js';
+import type { DomainEvent } from '@serenity-js/core/events';
 import {
     AsyncOperationAttempted,
     AsyncOperationCompleted,
@@ -10,8 +10,8 @@ import {
     TestRunFinishes,
     TestSuiteFinished,
     TestSuiteStarts
-} from '@serenity-js/core/lib/events/index.js';
-import type { Outcome, TestSuiteDetails } from '@serenity-js/core/lib/model/index.js';
+} from '@serenity-js/core/events';
+import type { Outcome, TestSuiteDetails } from '@serenity-js/core/model';
 import {
     CorrelationId,
     Description,
@@ -23,7 +23,7 @@ import {
     ImplementationPending,
     Name,
     ProblemIndication
-} from '@serenity-js/core/lib/model/index.js';
+} from '@serenity-js/core/model';
 import type { Test as testStats } from '@wdio/reporter';
 import type { Capabilities, Frameworks } from '@wdio/types';
 import type { EventEmitter } from 'events';

package/src/adapter/reporter/BrowserCapabilitiesReporter.ts

@@ -1,6 +1,6 @@
 import type { Serenity } from '@serenity-js/core';
-import { SceneTagged } from '@serenity-js/core/lib/events/index.js';
-import type { Tag } from '@serenity-js/core/lib/model/index.js';
+import { SceneTagged } from '@serenity-js/core/events';
+import type { Tag } from '@serenity-js/core/model';
 import Reporter from '@wdio/reporter';
 import type { Capabilities, Options, Reporters } from '@wdio/types';
 

package/src/adapter/reporter/OutputStreamBuffer.ts

@@ -1,4 +1,4 @@
-import type { OutputStream } from '@serenity-js/core/lib/adapter/index.js';
+import type { OutputStream } from '@serenity-js/core/adapter';
 
 /**
  * @package

package/src/adapter/reporter/OutputStreamBufferPrinter.ts

@@ -1,7 +1,7 @@
 import type { Stage, StageCrewMember } from '@serenity-js/core';
-import type { OutputStream } from '@serenity-js/core/lib/adapter/index.js';
-import type { DomainEvent} from '@serenity-js/core/lib/events/index.js';
-import { SceneFinished } from '@serenity-js/core/lib/events/index.js';
+import type { OutputStream } from '@serenity-js/core/adapter';
+import type { DomainEvent} from '@serenity-js/core/events';
+import { SceneFinished } from '@serenity-js/core/events';
 
 import type { OutputStreamBuffer } from './OutputStreamBuffer.js';
 

package/src/adapter/reporter/ProvidesWriteStream.ts

@@ -1,4 +1,4 @@
-import type { OutputStream } from '@serenity-js/core/lib/adapter/index.js';
+import type { OutputStream } from '@serenity-js/core/adapter';
 
 /**
  * @package

package/src/adapter/reporter/TagPrinter.ts

@@ -1,5 +1,5 @@
-import type { Tag } from '@serenity-js/core/lib/model/index.js';
-import { BrowserTag, PlatformTag } from '@serenity-js/core/lib/model/index.js';
+import type { Tag } from '@serenity-js/core/model';
+import { BrowserTag, PlatformTag } from '@serenity-js/core/model';
 import type { Capabilities } from '@wdio/types';
 
 /**

package/src/index.ts

@@ -1,5 +1,5 @@
 import { serenity } from '@serenity-js/core';
-import { ModuleLoader, Path } from '@serenity-js/core/lib/io/index.js';
+import { ModuleLoader, Path } from '@serenity-js/core/io';
 import type { Capabilities } from '@wdio/types';
 import type { EventEmitter } from 'events';
 

package/src/screenplay/models/WebdriverIOBrowsingSession.ts

@@ -1,7 +1,7 @@
 import 'webdriverio';
 
 import { type Discardable, LogicError } from '@serenity-js/core';
-import { CorrelationId } from '@serenity-js/core/lib/model/index.js';
+import { CorrelationId } from '@serenity-js/core/model';
 import type { BrowserCapabilities } from '@serenity-js/web';
 import { BrowsingSession } from '@serenity-js/web';
 

package/src/screenplay/models/WebdriverIOModalDialogHandler.ts

@@ -23,7 +23,7 @@ export class WebdriverIOModalDialogHandler extends ModalDialogHandler implements
         }
 
     private currentHandler: (dialog: WebdriverIO.Dialog) => Promise<void>;
-    private dialog?: WebdriverIO.Dialog;
+    private pendingDialogHandling: Promise<void> = Promise.resolve();
 
     constructor(private readonly browser: WebdriverIO.Browser) {
         super();
@@ -33,7 +33,9 @@ export class WebdriverIOModalDialogHandler extends ModalDialogHandler implements
         this.browser.on('dialog', this.onDialog);
     }
 
-    private onDialog = this.tryToHandleDialog.bind(this);
+    private onDialog = (dialog: WebdriverIO.Dialog) => {
+        this.pendingDialogHandling = this.tryToHandleDialog(dialog);
+    };
 
     private async tryToHandleDialog(dialog: WebdriverIO.Dialog): Promise<void> {
         try {
@@ -84,13 +86,18 @@ export class WebdriverIOModalDialogHandler extends ModalDialogHandler implements
     }
 
     async dismiss(): Promise<void> {
-        if (! this.dialog) {
-            return;
+        try {
+            const message = await this.browser.getAlertText();
+            await this.browser.dismissAlert();
+            this.modalDialog = new DismissedModalDialog(message);
+        }
+        catch (error) {
+            // Dialog might have already been handled by the event listener
+            if (error.message?.includes(WebdriverProtocolErrorCode.NoSuchAlertError)) {
+                return;
+            }
+            throw error;
         }
-
-        const message = this.dialog.message();
-        await this.dialog.dismiss();
-        this.modalDialog = new DismissedModalDialog(message);
     }
 
     async reset(): Promise<void> {
@@ -102,6 +109,7 @@ export class WebdriverIOModalDialogHandler extends ModalDialogHandler implements
      * @override
      */
     async last(): Promise<ModalDialog> {
+        await this.pendingDialogHandling;
         return this.modalDialog;
     }
 

package/src/screenplay/models/WebdriverIOPage.ts

@@ -3,7 +3,7 @@ import 'webdriverio';
 import { URL } from 'node:url';
 
 import { type Discardable, List, LogicError } from '@serenity-js/core';
-import type { CorrelationId } from '@serenity-js/core/lib/model/index.js';
+import type { CorrelationId } from '@serenity-js/core/model';
 import type { Cookie, CookieData, ModalDialogHandler, PageElements, Selector } from '@serenity-js/web';
 import {
     ArgumentDehydrator,
@@ -14,7 +14,7 @@ import {
     PageElement,
     PageElementsLocator
 } from '@serenity-js/web';
-import * as scripts from '@serenity-js/web/lib/scripts/index.js';
+import * as scripts from '@serenity-js/web/scripts';
 import type { TransformElement } from 'webdriverio';
 
 import { WebdriverIOExistingElementLocator, WebdriverIOLocator, WebdriverIORootLocator } from './locators/index.js';
@@ -262,7 +262,23 @@ export class WebdriverIOPage extends Page<WebdriverIO.Element> implements Discar
 
     async setViewportSize(size: { width: number, height: number }): Promise<void> {
         return await this.inContextOfThisPage(async () => {
-            await this.browser.setViewport(size);
+            // Use BiDi setViewport when available as it handles devicePixelRatio correctly
+            if (this.browser.isBidi) {
+                return this.browser.setViewport(size);
+            }
+
+            // Fall back to classic WebDriver approach for non-BiDi sessions
+            const desiredWindowSize = await this.browser.execute(`
+                var currentViewportWidth  = Math.max(document.documentElement.clientWidth, window.innerWidth || 0)
+                var currentViewportHeight = Math.max(document.documentElement.clientHeight, window.innerHeight || 0)
+
+                return {
+                    width:  Math.max(window.outerWidth  - currentViewportWidth  + ${ size.width },  ${ size.width }),
+                    height: Math.max(window.outerHeight - currentViewportHeight + ${ size.height }, ${ size.height }),
+                };
+            `) as { width: number, height: number };
+
+            return this.browser.setWindowSize(desiredWindowSize.width, desiredWindowSize.height);
         });
     }
 

package/src/screenplay/models/WebdriverIOPageElement.ts

@@ -3,7 +3,7 @@ import 'webdriverio';
 import { LogicError } from '@serenity-js/core';
 import type { SwitchableOrigin } from '@serenity-js/web';
 import { Key, PageElement, SelectOption } from '@serenity-js/web';
-import * as scripts from '@serenity-js/web/lib/scripts/index.js';
+import * as scripts from '@serenity-js/web/scripts';
 
 import type { WebdriverIOLocator } from './locators/index.js';
 import { WebdriverProtocolErrorCode } from './WebdriverProtocolErrorCode.js';
@@ -165,6 +165,20 @@ export class WebdriverIOPageElement extends PageElement<WebdriverIO.Element> {
 
     async value(): Promise<string> {
         const element = await this.nativeElement();
+        const browser = await this.browserFor(element);
+
+        // WebdriverIO v9 returns empty string for non-input elements instead of throwing
+        // Check if element actually supports the value property
+        const hasValueProperty = await browser.execute(
+            /* c8 ignore next */
+            (element_: HTMLElement) => 'value' in element_,
+            element as unknown as HTMLElement
+        );
+
+        if (! hasValueProperty) {
+            return undefined;
+        }
+
         return await element.getValue() as string;
     }
 

package/tsconfig-esm.build.json

@@ -1,7 +1,7 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig-esm.options.json",
   "compilerOptions": {
-    "module": "Node16",
+    "module": "Node20",
     "moduleResolution": "Node16",
     "outDir": "esm",
     "rootDir": "src",