@testring/plugin-selenium-driver 0.6.14-alpha.2 → 0.6.14-alpha.4

package/dist/plugin/index.js

@@ -18,21 +18,20 @@ const logger_1 = require("@testring/logger");
 const dwnld_collector_crx_1 = require("@testring/dwnld-collector-crx");
 const devtool_extension_1 = require("@testring/devtool-extension");
 const code_coverage_client_1 = require("@nullcc/code-coverage-client");
-// Stupidly needed thing for making our own requests
-const _webdriverReq = require('webdriver/build/request');
-const WebDriverRequest = _webdriverReq.default;
+const webdriver_1 = require("webdriver");
 const DEFAULT_CONFIG = {
     recorderExtension: false,
     clientCheckInterval: 5 * 1000,
     clientTimeout: 15 * 60 * 1000,
     port: 4444,
-    logLevel: 'warn',
+    logLevel: 'error',
     capabilities: {
         browserName: 'chrome',
         'goog:chromeOptions': {
             // for local ChromeDriver
             args: [],
         },
+        'wdio:enforceWebDriverClassic': true
     },
     cdpCoverage: false,
 };
@@ -339,16 +338,6 @@ class SeleniumPlugin {
         });
     }
     addCustromMethods(client) {
-        // Creating our delete selenium session to be able to close
-        // session if it's id is changed while we are running test
-        client.addCommand('deleteSessionId', function (sessionId) {
-            const { w3cCaps, jsonwpCaps } = this.options.requestedCapabilities;
-            const sessionDeleteRequest = new WebDriverRequest('DELETE', '/session/:sessionId', {
-                capabilities: w3cCaps, // W3C compliant
-                desiredCapabilities: jsonwpCaps, // JSONWP compliant
-            });
-            return sessionDeleteRequest.makeRequest(this.options, sessionId);
-        }, false);
         return client;
     }
     end(applicant) {
@@ -376,7 +365,10 @@ class SeleniumPlugin {
                     `Session ids are not equal, started with - ${startingSessionID}, ended with - ${sessionID}`, () => __awaiter(this, void 0, void 0, function* () {
                     try {
                         if (startingSessionID) {
-                            yield client.deleteSessionId(startingSessionID);
+                            const attachedClient = webdriver_1.default.attachToSession({
+                                sessionId: startingSessionID,
+                            });
+                            yield attachedClient.deleteSession();
                         }
                     }
                     catch (err) {
@@ -451,10 +443,11 @@ class SeleniumPlugin {
             yield this.createClient(applicant);
             const client = this.getBrowserClient(applicant);
             const args = stringifyWindowFeatures(windowFeatures);
-            return client.newWindow(val, {
+            const newWindow = yield client.newWindow(val, {
                 windowName: windowName || this.generateWinId(),
                 windowFeatures: args,
             });
+            return (newWindow === null || newWindow === void 0 ? void 0 : newWindow.handle) || newWindow;
         });
     }
     waitForExist(applicant, xpath, timeout) {
@@ -547,7 +540,7 @@ class SeleniumPlugin {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.createClient(applicant);
             const client = this.getBrowserClient(applicant);
-            return client.switchToFrame(frameID);
+            return client.switchFrame(frameID.toString());
         });
     }
     frameParent(applicant) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testring/plugin-selenium-driver",
-  "version": "0.6.14-alpha.2",
+  "version": "0.6.14-alpha.4",
   "main": "./dist/index.js",
   "typings": "./src/index.ts",
   "repository": {
@@ -11,12 +11,12 @@
   "license": "MIT",
   "dependencies": {
     "@nullcc/code-coverage-client": "1.4.2",
-    "@testring/child-process": "0.6.14-alpha.2",
-    "@testring/devtool-extension": "0.6.14-alpha.2",
-    "@testring/dwnld-collector-crx": "0.6.14-alpha.2",
-    "@testring/logger": "0.6.14-alpha.2",
-    "@testring/plugin-api": "0.6.14-alpha.2",
-    "@testring/types": "0.6.14-alpha.2",
+    "@testring/child-process": "0.6.14-alpha.4",
+    "@testring/devtool-extension": "0.6.14-alpha.4",
+    "@testring/dwnld-collector-crx": "0.6.14-alpha.4",
+    "@testring/logger": "0.6.14-alpha.4",
+    "@testring/plugin-api": "0.6.14-alpha.4",
+    "@testring/types": "0.6.14-alpha.4",
     "@types/deepmerge": "2.2.3",
     "@types/node": "22.8.5",
     "@wdio/types": "9.2.2",

package/src/plugin/index.ts

@@ -19,14 +19,10 @@ import type {
 } 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');
-const WebDriverRequest = _webdriverReq.default;
+import webdriver from 'webdriver';
 
 type BrowserObjectCustom = WebdriverIO.Browser & {
     sessionId: string;
-    deleteSessionId: (sessionId: string) => Promise<void>;
 };
 
 type browserClientItem = {
@@ -41,13 +37,14 @@ const DEFAULT_CONFIG: SeleniumPluginConfig = {
     clientCheckInterval: 5 * 1000,
     clientTimeout: 15 * 60 * 1000,
     port: 4444,
-    logLevel: 'warn',
+    logLevel: 'error',
     capabilities: {
         browserName: 'chrome',
         'goog:chromeOptions': {
             // for local ChromeDriver
             args: [] as string[],
         },
+        'wdio:enforceWebDriverClassic': true
     },
     cdpCoverage: false,
 };
@@ -437,31 +434,6 @@ export class SeleniumPlugin implements IBrowserProxyPlugin {
     protected addCustromMethods(
         client: BrowserObjectCustom,
     ): BrowserObjectCustom {
-        // Creating our delete selenium session to be able to close
-        // session if it's id is changed while we are running test
-        client.addCommand(
-            'deleteSessionId',
-            function (sessionId) {
-                const {w3cCaps, jsonwpCaps} =
-                    this.options.requestedCapabilities;
-
-                const sessionDeleteRequest = new WebDriverRequest(
-                    'DELETE',
-                    '/session/:sessionId',
-                    {
-                        capabilities: w3cCaps, // W3C compliant
-                        desiredCapabilities: jsonwpCaps, // JSONWP compliant
-                    },
-                );
-
-                return sessionDeleteRequest.makeRequest(
-                    this.options,
-                    sessionId,
-                );
-            },
-            false,
-        );
-
         return client as BrowserObjectCustom;
     }
 
@@ -496,7 +468,10 @@ export class SeleniumPlugin implements IBrowserProxyPlugin {
                 async () => {
                     try {
                         if (startingSessionID) {
-                            await client.deleteSessionId(startingSessionID);
+                            const attachedClient = webdriver.attachToSession({
+                                sessionId: startingSessionID,
+                            });
+                            await attachedClient.deleteSession();
                         }
                     } catch (err) {
                         this.logger.error(
@@ -590,10 +565,11 @@ export class SeleniumPlugin implements IBrowserProxyPlugin {
         const client = this.getBrowserClient(applicant);
         const args = stringifyWindowFeatures(windowFeatures);
 
-        return client.newWindow(val, {
+        const newWindow = await client.newWindow(val, {
             windowName: windowName || this.generateWinId(),
             windowFeatures: args,
         });
+        return newWindow?.handle || newWindow;
     }
 
     public async waitForExist(
@@ -698,8 +674,7 @@ export class SeleniumPlugin implements IBrowserProxyPlugin {
     public async frame(applicant: string, frameID: number) {
         await this.createClient(applicant);
         const client = this.getBrowserClient(applicant);
-
-        return client.switchToFrame(frameID);
+        return client.switchFrame(frameID.toString());
     }
 
     public async frameParent(applicant: string) {

package/src/types.ts

@@ -1,6 +1,6 @@
 import { Capabilities } from '@wdio/types';
 
-export type SeleniumPluginConfig = Capabilities.RemoteConfig & {
+export type SeleniumPluginConfig = Capabilities.WebdriverIOConfig & {
     chromeDriverPath?: string;
     recorderExtension: boolean;
     clientCheckInterval: number;