@applitools/spec-driver-selenium 1.4.1 → 1.4.3

package/dist/spec-driver.js

@@ -23,7 +23,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.build = exports.performAction = exports.getElementText = exports.getElementAttribute = exports.getElementRegion = exports.getOrientation = exports.setOrientation = exports.getSystemBars = exports.waitUntilDisplayed = exports.scrollIntoView = exports.type = exports.hover = exports.click = exports.takeScreenshot = exports.visit = exports.getUrl = exports.getTitle = exports.getCapabilities = exports.getDriverInfo = exports.getCookies = exports.setWindowSize = exports.getWindowSize = exports.waitForSelector = exports.findElements = exports.findElement = exports.childContext = exports.parentContext = exports.mainContext = exports.executeScript = exports.isEqualElements = exports.isStaleElementError = exports.untransformSelector = exports.transformSelector = exports.transformDriver = exports.isSelector = exports.isElement = exports.isDriver = void 0;
+exports.build = exports.switchWorld = exports.getWorlds = exports.getCurrentWorld = exports.performAction = exports.getElementText = exports.getElementAttribute = exports.getElementRegion = exports.getOrientation = exports.setOrientation = exports.getSystemBars = exports.waitUntilDisplayed = exports.scrollIntoView = exports.type = exports.hover = exports.click = exports.takeScreenshot = exports.visit = exports.getUrl = exports.getTitle = exports.getCapabilities = exports.getDriverInfo = exports.getCookies = exports.setWindowSize = exports.getWindowSize = exports.waitForSelector = exports.findElements = exports.findElement = exports.childContext = exports.parentContext = exports.mainContext = exports.executeScript = exports.isEqualElements = exports.isStaleElementError = exports.untransformSelector = exports.transformSelector = exports.transformDriver = exports.isSelector = exports.isElement = exports.isDriver = void 0;
+const command_1 = require("selenium-webdriver/lib/command");
 const Selenium = __importStar(require("selenium-webdriver"));
 const utils = __importStar(require("@applitools/utils"));
 // #region HELPERS
@@ -39,6 +40,11 @@ function transformShadowRoot(driver, shadowRoot) {
 function isByHashSelector(selector) {
     return byHash.includes(Object.keys(selector)[0]);
 }
+async function executeCustomCommand(driver, command) {
+    return process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3'
+        ? driver.schedule(command)
+        : driver.execute(command);
+}
 // #endregion
 // #region UTILITY
 function isDriver(driver) {
@@ -67,7 +73,10 @@ function transformDriver(driver) {
     driver.getExecutor().defineCommand('setWindowPosition', 'POST', '/session/:sessionId/window/current/position');
     driver.getExecutor().defineCommand('performTouch', 'POST', '/session/:sessionId/touch/perform');
     driver.getExecutor().defineCommand('executeCdp', 'POST', '/session/:sessionId/chromium/send_command_and_get_result');
-    driver.getExecutor().defineCommand('setOrientation', 'POST', '/session/:sessionId/orientation/');
+    driver.getExecutor().defineCommand('setOrientation', 'POST', '/session/:sessionId/orientation');
+    driver.getExecutor().defineCommand('getCurrentContext', 'GET', '/session/:sessionId/context');
+    driver.getExecutor().defineCommand('getContexts', 'GET', '/session/:sessionId/contexts');
+    driver.getExecutor().defineCommand('switchToContext', 'POST', '/session/:sessionId/context');
     if (process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3') {
         driver.getExecutor().defineCommand('switchToParentFrame', 'POST', '/session/:sessionId/frame/parent');
     }
@@ -135,8 +144,7 @@ async function mainContext(driver) {
 exports.mainContext = mainContext;
 async function parentContext(driver) {
     if (process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3') {
-        const { Command } = require('selenium-webdriver/lib/command');
-        await driver.schedule(new Command('switchToParentFrame'));
+        await executeCustomCommand(driver, new command_1.Command('switchToParentFrame'));
         return driver;
     }
     await driver.switchTo().parentFrame();
@@ -183,11 +191,9 @@ async function getWindowSize(driver) {
         return { width: rect.width, height: rect.height };
     }
     catch {
-        const { Command } = require('selenium-webdriver/lib/command');
-        const getWindowSizeCommand = new Command('getWindowSize');
         const size = driver.manage().window().getSize
             ? await driver.manage().window().getSize()
-            : await driver.execute(getWindowSizeCommand);
+            : await executeCustomCommand(driver, new command_1.Command('getWindowSize'));
         return { width: size.width, height: size.height };
     }
 }
@@ -197,17 +203,14 @@ async function setWindowSize(driver, size) {
         await driver.manage().window().setRect({ x: 0, y: 0, width: size.width, height: size.height });
     }
     catch {
-        const { Command } = require('selenium-webdriver/lib/command');
-        const setWindowPositionCommand = new Command('setWindowPosition').setParameters({ x: 0, y: 0 });
         if (driver.manage().window().setPosition)
             await driver.manage().window().setPosition(0, 0);
         else
-            await driver.execute(setWindowPositionCommand);
-        const setWindowSizeCommand = new Command('setWindowSize').setParameters({ ...size });
+            await executeCustomCommand(driver, new command_1.Command('setWindowPosition').setParameters({ x: 0, y: 0 }));
         if (driver.manage().window().setSize)
             await driver.manage().window().setSize(size.width, size.height);
         else
-            await driver.execute(setWindowSizeCommand);
+            await executeCustomCommand(driver, new command_1.Command('setWindowSize').setParameters({ ...size }));
     }
 }
 exports.setWindowSize = setWindowSize;
@@ -220,13 +223,7 @@ async function getCookies(driver, context) {
         cookies = response.cookies;
     }
     else {
-        const { Command } = require('selenium-webdriver/lib/command');
-        const executeCdpCommand = new Command('executeCdp')
-            .setParameter('cmd', 'Network.getAllCookies')
-            .setParameter('params', {});
-        const response = process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3'
-            ? await driver.schedule(executeCdpCommand)
-            : await driver.execute(executeCdpCommand);
+        const response = await executeCustomCommand(driver, new command_1.Command('executeCdp').setParameter('cmd', 'Network.getAllCookies').setParameter('params', {}));
         cookies = response.cookies;
     }
     return cookies.map((cookie) => {
@@ -249,11 +246,7 @@ async function getDriverInfo(driver) {
 exports.getDriverInfo = getDriverInfo;
 async function getCapabilities(driver) {
     try {
-        const { Command } = require('selenium-webdriver/lib/command');
-        const getSessionDetailsCommand = new Command('getSessionDetails');
-        return process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3'
-            ? await driver.schedule(getSessionDetailsCommand)
-            : await driver.execute(getSessionDetailsCommand);
+        return executeCustomCommand(driver, new command_1.Command('getSessionDetails'));
     }
     catch {
         const capabilities = await driver.getCapabilities();
@@ -316,27 +309,15 @@ exports.waitUntilDisplayed = waitUntilDisplayed;
 // #endregion
 // #region MOBILE COMMANDS
 async function getSystemBars(driver) {
-    const { Command } = require('selenium-webdriver/lib/command');
-    const getSystemBarsCommand = new Command('getSystemBars');
-    return process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3'
-        ? await driver.schedule(getSystemBarsCommand)
-        : await driver.execute(getSystemBarsCommand);
+    return executeCustomCommand(driver, new command_1.Command('getSystemBars'));
 }
 exports.getSystemBars = getSystemBars;
 async function setOrientation(driver, orientation) {
-    const { Command } = require('selenium-webdriver/lib/command');
-    const setOrientationCommand = new Command('setOrientation').setParameters({ orientation });
-    process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3'
-        ? await driver.schedule(setOrientationCommand)
-        : await driver.execute(setOrientationCommand);
+    await executeCustomCommand(driver, new command_1.Command('setOrientation').setParameters({ orientation }));
 }
 exports.setOrientation = setOrientation;
 async function getOrientation(driver) {
-    const { Command } = require('selenium-webdriver/lib/command');
-    const getOrientationCommand = new Command('getOrientation');
-    const orientation = process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3'
-        ? await driver.schedule(getOrientationCommand)
-        : await driver.execute(getOrientationCommand);
+    const orientation = await executeCustomCommand(driver, new command_1.Command('getOrientation'));
     return orientation.toLowerCase();
 }
 exports.getOrientation = getOrientation;
@@ -360,18 +341,23 @@ async function getElementText(_driver, element) {
 }
 exports.getElementText = getElementText;
 async function performAction(driver, steps) {
-    const { Command } = require('selenium-webdriver/lib/command');
-    const performTouchCommand = new Command('performTouch').setParameters({
+    await executeCustomCommand(driver, new command_1.Command('performTouch').setParameters({
         actions: steps.map(({ action, ...options }) => ({ action, options })),
-    });
-    if (process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3') {
-        await driver.schedule(performTouchCommand);
-    }
-    else {
-        await driver.execute(performTouchCommand);
-    }
+    }));
 }
 exports.performAction = performAction;
+async function getCurrentWorld(driver) {
+    return executeCustomCommand(driver, new command_1.Command('getCurrentContext'));
+}
+exports.getCurrentWorld = getCurrentWorld;
+async function getWorlds(driver) {
+    return executeCustomCommand(driver, new command_1.Command('getContexts'));
+}
+exports.getWorlds = getWorlds;
+async function switchWorld(driver, name) {
+    return executeCustomCommand(driver, new command_1.Command('switchToContext').setParameters({ name }));
+}
+exports.switchWorld = switchWorld;
 // #endregion
 // #region TESTING
 const browserOptionsNames = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/spec-driver-selenium",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "keywords": [
     "selenium",
     "selenium-webdriver",
@@ -83,7 +83,7 @@
     "husky": "^4.3.7",
     "mocha": "^9.2.2",
     "prettier": "^2.6.2",
-    "selenium-webdriver": "^4.2.0",
+    "selenium-webdriver": "4.4.0",
     "ts-node": "^10.8.0",
     "ttypescript": "^1.5.13",
     "typescript": "^4.7.2"

package/types/index.d.ts

@@ -48,6 +48,9 @@ export function getElementRegion(_driver: Driver, element: Element): Promise<imp
 export function getElementAttribute(_driver: Driver, element: Element, attr: string): Promise<string>;
 export function getElementText(_driver: Driver, element: Element): Promise<string>;
 export function performAction(driver: Driver, steps: Array<any>): Promise<void>;
+export function getCurrentWorld(driver: Driver): Promise<string>;
+export function getWorlds(driver: Driver): Promise<Array<string>>;
+export function switchWorld(driver: Driver, name: string): Promise<void>;
 export function build(__0: any): Promise<[import('selenium-webdriver').WebDriver & { __applitoolsBrand?: never; } & { __serverUrl?: string; }, () => Promise<void>]>;
 export type Driver = import('selenium-webdriver').WebDriver & { __applitoolsBrand?: never; };
 export type Element = import('selenium-webdriver').WebElement & { __applitoolsBrand?: never; };