@testring/plugin-selenium-driver 0.6.12 → 0.6.14-alpha.1

package/dist/index.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = seleniumPlugin;
 const path = require("path");
 function seleniumPlugin(pluginAPI, userConfig) {
     const pluginPath = path.join(__dirname, './plugin');
     const browserProxy = pluginAPI.getBrowserProxy();
     browserProxy.proxyPlugin(pluginPath, userConfig || {});
 }
-exports.default = seleniumPlugin;

package/dist/plugin/index.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SeleniumPlugin = void 0;
+exports.default = seleniumProxy;
 const webdriverio_1 = require("webdriverio");
 const deepmerge = require("deepmerge");
 const child_process_1 = require("@testring/child-process");
@@ -74,7 +75,7 @@ class SeleniumPlugin {
     }
     // eslint-disable-next-line sonarjs/cognitive-complexity
     createConfig(config) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         let mergedConfig = deepmerge.all([DEFAULT_CONFIG, config], {
             clone: true,
         });
@@ -130,10 +131,8 @@ class SeleniumPlugin {
             mergedConfig.hostname = mergedConfig.host;
         }
         const googleChromeOptions = (_a = mergedConfig.capabilities) === null || _a === void 0 ? void 0 : _a['goog:chromeOptions'];
-        if (googleChromeOptions &&
-            (((_b = googleChromeOptions.args) === null || _b === void 0 ? void 0 : _b.includes('--headless')) ||
-                ((_c = googleChromeOptions.args) === null || _c === void 0 ? void 0 : _c.includes('headless')))) {
-            const extensions = (_d = mergedConfig.capabilities) === null || _d === void 0 ? void 0 : _d['goog:chromeOptions'].extensions;
+        if ((_b = googleChromeOptions === null || googleChromeOptions === void 0 ? void 0 : googleChromeOptions.args) === null || _b === void 0 ? void 0 : _b.includes('--headless=new')) {
+            const extensions = googleChromeOptions.extensions;
             const dowldMonitorCrx = (0, dwnld_collector_crx_1.getCrxBase64)();
             if (extensions) {
                 extensions.push(dowldMonitorCrx);
@@ -345,7 +344,7 @@ class SeleniumPlugin {
         client.addCommand('deleteSessionId', function (sessionId) {
             const { w3cCaps, jsonwpCaps } = this.options.requestedCapabilities;
             const sessionDeleteRequest = new WebDriverRequest('DELETE', '/session/:sessionId', {
-                capabilities: w3cCaps,
+                capabilities: w3cCaps, // W3C compliant
                 desiredCapabilities: jsonwpCaps, // JSONWP compliant
             });
             return sessionDeleteRequest.makeRequest(this.options, sessionId);
@@ -447,8 +446,8 @@ class SeleniumPlugin {
         this.incrementWinId++;
         return `window-${this.incrementWinId}`;
     }
-    newWindow(applicant, val, windowName, windowFeatures = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
+    newWindow(applicant_1, val_1, windowName_1) {
+        return __awaiter(this, arguments, void 0, function* (applicant, val, windowName, windowFeatures = {}) {
             yield this.createClient(applicant);
             const client = this.getBrowserClient(applicant);
             const args = stringifyWindowFeatures(windowFeatures);
@@ -482,8 +481,8 @@ class SeleniumPlugin {
             return selector.isDisplayed();
         });
     }
-    moveToObject(applicant, xpath, xOffset = 0, yOffset = 0) {
-        return __awaiter(this, void 0, void 0, function* () {
+    moveToObject(applicant_1, xpath_1) {
+        return __awaiter(this, arguments, void 0, function* (applicant, xpath, xOffset = 0, yOffset = 0) {
             yield this.createClient(applicant);
             const client = this.getBrowserClient(applicant);
             const selector = yield client.$(xpath);
@@ -692,8 +691,8 @@ class SeleniumPlugin {
         });
     }
     getCookie(applicant, cookieName) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             yield this.createClient(applicant);
             const client = this.getBrowserClient(applicant);
             if (cookieName) {
@@ -931,40 +930,7 @@ class SeleniumPlugin {
             yield this.createClient(applicant);
             const client = this.getBrowserClient(applicant);
             const mock = yield client.mock(url, filterOptions);
-            if (typeof overwrites === 'function') {
-                mock.respond((res) => {
-                    overwrites(res);
-                    this.setMockData(applicant, url, res);
-                    return res.body;
-                }, mockResponseParams);
-            }
-            else {
-                mock.respond(overwrites);
-            }
-        });
-    }
-    setMockData(applicant, url, data) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.createClient(applicant);
-            const client = this.getBrowserClient(applicant);
-            client.mockData = client.mockData || {};
-            if (client.mockData[url]) {
-                client.mockData[url].push(data);
-            }
-            else {
-                client.mockData[url] = [data];
-            }
-            return true;
-        });
-    }
-    getMockData(applicant, url) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.createClient(applicant);
-            const client = this.getBrowserClient(applicant);
-            if (url) {
-                return client.mockData[url];
-            }
-            return client.mockData;
+            mock.respond(overwrites, mockResponseParams);
         });
     }
     emulateDevice(applicant, deviceName) {
@@ -989,4 +955,3 @@ exports.SeleniumPlugin = SeleniumPlugin;
 function seleniumProxy(config) {
     return new SeleniumPlugin(config);
 }
-exports.default = seleniumProxy;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testring/plugin-selenium-driver",
-  "version": "0.6.12",
+  "version": "0.6.14-alpha.1",
   "main": "./dist/index.js",
   "typings": "./src/index.ts",
   "repository": {
@@ -11,17 +11,19 @@
   "license": "MIT",
   "dependencies": {
     "@nullcc/code-coverage-client": "1.4.2",
-    "@testring/child-process": "0.6.12",
-    "@testring/devtool-extension": "0.6.12",
-    "@testring/dwnld-collector-crx": "0.6.12",
-    "@testring/logger": "0.6.12",
-    "@testring/plugin-api": "0.6.12",
-    "@testring/types": "0.6.12",
-    "@types/deepmerge": "2.2.0",
-    "@types/node": "18.11.18",
+    "@testring/child-process": "0.6.14-alpha.1",
+    "@testring/devtool-extension": "0.6.14-alpha.1",
+    "@testring/dwnld-collector-crx": "0.6.14-alpha.1",
+    "@testring/logger": "0.6.14-alpha.1",
+    "@testring/plugin-api": "0.6.14-alpha.1",
+    "@testring/types": "0.6.14-alpha.1",
+    "@types/deepmerge": "2.2.3",
+    "@types/node": "22.8.5",
+    "@wdio/types": "9.2.2",
     "chromedriver": "*",
-    "deepmerge": "4.2.2",
+    "deepmerge": "4.3.1",
+    "puppeteer-core": "22.3.0",
     "selenium-server": "3.141.59",
-    "webdriverio": "7.20.7"
+    "webdriverio": "9.2.6"
   }
 }

package/src/plugin/index.ts

@@ -16,9 +16,9 @@ import type {Cookie} from '@wdio/protocols';
 import type {
     ClickOptions,
     MockFilterOptions,
-    MockResponseParams,
-    Matches,
 } from 'webdriverio';
+import type {JsonCompatible} from '@wdio/types';
+import type {RespondWithOptions} from 'webdriverio/build/utils/interception/types';
 
 // Stupidly needed thing for making our own requests
 const _webdriverReq = require('webdriver/build/request');
@@ -27,7 +27,6 @@ const WebDriverRequest = _webdriverReq.default;
 type BrowserObjectCustom = WebdriverIO.Browser & {
     sessionId: string;
     deleteSessionId: (sessionId: string) => Promise<void>;
-    mockData: Record<string, Matches[]>;
 };
 
 type browserClientItem = {
@@ -187,14 +186,8 @@ export class SeleniumPlugin implements IBrowserProxyPlugin {
         }
 
         const googleChromeOptions = mergedConfig.capabilities?.['goog:chromeOptions'];
-        if (
-            googleChromeOptions && 
-            (
-                googleChromeOptions.args?.includes('--headless') || 
-                googleChromeOptions.args?.includes('headless')
-            )
-        ) {
-            const extensions = mergedConfig.capabilities?.['goog:chromeOptions'].extensions;
+        if (googleChromeOptions?.args?.includes('--headless=new')) {
+            const extensions = googleChromeOptions.extensions;
             const dowldMonitorCrx = getCrxBase64();
             if (extensions) {
                 extensions.push(dowldMonitorCrx);
@@ -215,7 +208,7 @@ export class SeleniumPlugin implements IBrowserProxyPlugin {
         }
 
         process.on('exit', () => {
-            clearInterval(this.clientCheckInterval);
+            clearInterval(this.clientCheckInterval as NodeJS.Timeout);
             this.stopAllSessions().catch((err) => {
                 this.logger.error('Clean process exit failed', err);
             });
@@ -1156,46 +1149,15 @@ export class SeleniumPlugin implements IBrowserProxyPlugin {
     public async mock(
         applicant: string,
         url: string,
-        overwrites: ((res: Matches) => void) | Object | string,
+        overwrites: string | JsonCompatible | Buffer,
         filterOptions?: MockFilterOptions,
-        mockResponseParams?: MockResponseParams,
+        mockResponseParams?: Omit<RespondWithOptions, 'body'>,
     ) {
         await this.createClient(applicant);
         const client = this.getBrowserClient(applicant);
 
         const mock = await client.mock(url, filterOptions);
-        if (typeof overwrites === 'function') {
-            mock.respond((res) => {
-                overwrites(res);
-                this.setMockData(applicant, url, res);
-                return res.body;
-            }, mockResponseParams);
-        } else {
-            mock.respond(overwrites);
-        }
-    }
-
-    public async setMockData(applicant: string, url: string, data: Matches) {
-        await this.createClient(applicant);
-        const client = this.getBrowserClient(applicant);
-
-        client.mockData = client.mockData || {};
-        if (client.mockData[url]) {
-            client.mockData[url].push(data);
-        } else {
-            client.mockData[url] = [data];
-        }
-        return true;
-    }
-
-    public async getMockData(applicant: string, url: string) {
-        await this.createClient(applicant);
-        const client = this.getBrowserClient(applicant);
-
-        if (url) {
-            return client.mockData[url];
-        }
-        return client.mockData;
+        mock.respond(overwrites, mockResponseParams);
     }
 
     public async emulateDevice(applicant: string, deviceName) {

package/src/types.ts

@@ -1,11 +1,11 @@
-import {RemoteOptions} from 'webdriverio';
+import { Capabilities } from '@wdio/types';
 
-export type SeleniumPluginConfig = RemoteOptions & {
+export type SeleniumPluginConfig = Capabilities.RemoteConfig & {
     chromeDriverPath?: string;
     recorderExtension: boolean;
     clientCheckInterval: number;
     clientTimeout: number;
     host?: string; // fallback for configuration. In WebdriverIO 5 field host renamed to hostname
-    desiredCapabilities?: WebDriver.DesiredCapabilities[]; // fallback for configuration. In WebdriverIO 5 field renamed
+    desiredCapabilities?: Capabilities.RequestedStandaloneCapabilities[]; // fallback for configuration. In WebdriverIO 5 field renamed
     cdpCoverage: boolean;
 };