@applitools/spec-driver-selenium 1.3.10 → 1.3.13

package/dist/index.js

@@ -38,4 +38,5 @@ if (!process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION) {
     }
 }
 __exportStar(require("./spec-driver"), exports);
-exports.default = spec;
+const typedSpec = spec;
+exports.default = typedSpec;

package/dist/spec-driver.js

@@ -23,7 +23,7 @@ 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.getBarsSize = 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.transformSelector = exports.transformDriver = exports.isSelector = exports.isElement = exports.isDriver = void 0;
+exports.build = exports.performAction = exports.getElementText = exports.getElementAttribute = exports.getElementRegion = exports.getOrientation = exports.setOrientation = exports.getBarsSize = 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 Selenium = __importStar(require("selenium-webdriver"));
 const utils = __importStar(require("@applitools/utils"));
 // #region HELPERS
@@ -36,6 +36,9 @@ function transformShadowRoot(driver, shadowRoot) {
         ? new Selenium.WebElement(driver, shadowRoot['shadow-6066-11e4-a52e-4f735466cecf'])
         : shadowRoot;
 }
+function isByHashSelector(selector) {
+    return byHash.includes(Object.keys(selector)[0]);
+}
 // #endregion
 // #region UTILITY
 function isDriver(driver) {
@@ -49,7 +52,10 @@ exports.isElement = isElement;
 function isSelector(selector) {
     if (!selector)
         return false;
-    return utils.types.has(selector, ['using', 'value']) || byHash.includes(Object.keys(selector)[0]);
+    return (utils.types.has(selector, ['using', 'value']) ||
+        isByHashSelector(selector) ||
+        utils.types.isFunction(selector) ||
+        utils.types.instanceOf(selector, 'RelativeBy'));
 }
 exports.isSelector = isSelector;
 function transformDriver(driver) {
@@ -85,6 +91,22 @@ function transformSelector(selector) {
     return selector;
 }
 exports.transformSelector = transformSelector;
+function untransformSelector(selector) {
+    if (utils.types.instanceOf(selector, 'RelativeBy') || utils.types.isFunction(selector)) {
+        return null;
+    }
+    else if (isByHashSelector(selector)) {
+        const [[how, what]] = Object.entries(selector);
+        if (how === 'js')
+            return null;
+        selector = Selenium.By[how](what);
+    }
+    if (utils.types.has(selector, ['using', 'value'])) {
+        return { type: selector.using === 'css selector' ? 'css' : selector.using, selector: selector.value };
+    }
+    return selector;
+}
+exports.untransformSelector = untransformSelector;
 function isStaleElementError(error) {
     if (!error)
         return false;
@@ -296,14 +318,9 @@ exports.waitUntilDisplayed = waitUntilDisplayed;
 async function getBarsSize(driver) {
     const { Command } = require('selenium-webdriver/lib/command');
     const getSystemBarsCommand = new Command('getSystemBars');
-    const { statusBar, navigationBar } = process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3'
+    return process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3'
         ? await driver.schedule(getSystemBarsCommand)
         : await driver.execute(getSystemBarsCommand);
-    return {
-        statusBarHeight: statusBar.visible ? statusBar.height : 0,
-        navigationBarHeight: navigationBar.visible ? navigationBar.height : 0,
-        navigationBarWidth: navigationBar.visible ? navigationBar.width : 0,
-    };
 }
 exports.getBarsSize = getBarsSize;
 async function setOrientation(driver, orientation) {
@@ -361,8 +378,9 @@ const browserOptionsNames = {
     chrome: 'goog:chromeOptions',
     firefox: 'moz:firefoxOptions',
 };
-async function build(env) {
+async function build({ selenium, ...env }) {
     var _a;
+    const { Builder } = (selenium !== null && selenium !== void 0 ? selenium : require('selenium-webdriver'));
     const parseEnv = require('@applitools/test-utils/src/parse-env');
     const { browser, capabilities, url, attach, proxy, configurable = true, appium = false, args = [], headless, } = parseEnv({ ...env, legacy: (_a = env.legacy) !== null && _a !== void 0 ? _a : process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3' });
     const desiredCapabilities = { ...capabilities };
@@ -387,7 +405,7 @@ async function build(env) {
     if (browser === 'chrome' && process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3') {
         desiredCapabilities['goog:chromeOptions'] = { w3c: false };
     }
-    const builder = new Selenium.Builder().withCapabilities(desiredCapabilities);
+    const builder = new Builder().withCapabilities(desiredCapabilities);
     if (url && !attach)
         builder.usingServer(url.href);
     if (proxy) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/spec-driver-selenium",
-  "version": "1.3.10",
+  "version": "1.3.13",
   "keywords": [
     "selenium",
     "selenium-webdriver",
@@ -18,7 +18,7 @@
   "repository": {
     "type": "git",
     "url": "git://github.com/applitools/eyes.sdk.javascript1.git",
-    "directory": "packages/spec-driver-selenium"
+    "directory": "js/packages/spec-driver-selenium"
   },
   "license": "SEE LICENSE IN LICENSE",
   "author": {
@@ -44,6 +44,7 @@
     "lint": "eslint '**/*.ts'",
     "build": "ttsc",
     "test": "mocha ./test/**/*.spec.ts --no-timeouts -r ts-node/register -r @applitools/test-utils/mocha-hooks/docker",
+    "test:sanity": "yarn test",
     "setup": "yarn docker:setup",
     "docker:setup": "node ../scripts/scripts/generate-docker-compose-config.js && docker-compose up -d",
     "docker:teardown": "docker-compose down",
@@ -61,14 +62,14 @@
     }
   },
   "dependencies": {
-    "@applitools/types": "1.5.3",
-    "@applitools/utils": "1.3.8"
+    "@applitools/types": "1.5.6",
+    "@applitools/utils": "1.3.10"
   },
   "devDependencies": {
-    "@applitools/api-extractor": "^1.2.8",
-    "@applitools/bongo": "2.1.5",
+    "@applitools/api-extractor": "^1.2.9",
+    "@applitools/bongo": "2.1.6",
     "@applitools/scripts": "1.1.0",
-    "@applitools/test-utils": "1.3.3",
+    "@applitools/test-utils": "1.3.4",
     "@types/mocha": "^9.1.1",
     "@types/node": "12",
     "@types/selenium-webdriver": "^4.1.1",

package/types/index.d.ts

@@ -4,7 +4,8 @@ export function isDriver(driver: any): driver is Driver;
 export function isElement(element: any): element is Element;
 export function isSelector(selector: any): selector is Selector;
 export function transformDriver(driver: Driver): Driver;
-export function transformSelector(selector: Selector | (string | { selector: string | Selector; type?: string; })): Selector;
+export function transformSelector(selector: string | { selector: string | Selector; type?: string; }): Selector;
+export function untransformSelector(selector: Selector): string | { selector: string; type?: string; };
 export function isStaleElementError(error: any): boolean;
 export function isEqualElements(_driver: Driver, element1: Element, element2: Element): Promise<boolean>;
 export function executeScript(driver: Driver, script: string | ((arg: any) => any), arg: any): Promise<any>;
@@ -28,14 +29,26 @@ export function hover(driver: Driver, element: Element | Selector): Promise<void
 export function type(driver: Driver, element: Element | Selector, keys: string): Promise<void>;
 export function scrollIntoView(driver: Driver, element: Element | Selector, align: boolean): Promise<void>;
 export function waitUntilDisplayed(driver: Driver, selector: Selector, timeout: number): Promise<void>;
-export function getBarsSize(driver: Driver): Promise<{ statusBarHeight: number; navigationBarHeight: number; navigationBarWidth: number; }>;
+export function getBarsSize(driver: Driver): Promise<{ statusBar: {
+    visible: boolean;
+    x: number;
+    y: number;
+    height: number;
+    width: number;
+}; navigationBar: {
+    visible: boolean;
+    x: number;
+    y: number;
+    height: number;
+    width: number;
+}; }>;
 export function setOrientation(driver: Driver, orientation: import('@applitools/types').ScreenOrientation): Promise<void>;
 export function getOrientation(driver: Driver): Promise<"portrait" | "landscape">;
 export function getElementRegion(_driver: Driver, element: Element): Promise<import('@applitools/types').Region>;
 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 build(env: any): Promise<[Driver, () => Promise<void>]>;
+export function build(__0: any): Promise<[Driver, () => Promise<void>]>;
 export type Driver = import('selenium-webdriver').WebDriver & { __applitoolsBrand?: never; };
 export type Element = import('selenium-webdriver').WebElement & { __applitoolsBrand?: never; };
-export type Selector = (import('selenium-webdriver').Locator | { using: string; value: string; }) & { __applitoolsBrand?: never; };
+export type Selector = (import('selenium-webdriver').By | import('selenium-webdriver').RelativeBy | import('selenium-webdriver').ByHash | { using: string; value: string; } | ((webdriver: import('selenium-webdriver').WebDriver) => Promise<any>)) & { __applitoolsBrand?: never; };