@applitools/spec-driver-selenium 1.5.25 → 1.5.26

package/dist/spec-driver.js

@@ -91,7 +91,7 @@ function transformSelector(selector) {
     else if (utils.types.has(selector, 'selector')) {
         if (!utils.types.isString(selector.selector))
             return selector.selector;
-        if (!utils.types.has(selector, 'type'))
+        if (!utils.types.has(selector, 'type') || !selector.type)
             return { css: selector.selector };
         if (selector.type === 'css')
             return { css: selector.selector };
@@ -176,21 +176,19 @@ async function findElements(driver, selector, parent) {
 }
 exports.findElements = findElements;
 async function waitForSelector(driver, selector, _parent, options) {
-    var _a;
-    if (((_a = options === null || options === void 0 ? void 0 : options.state) !== null && _a !== void 0 ? _a : 'exists') === 'exist') {
-        return driver.wait(Selenium.until.elementLocated(selector), options === null || options === void 0 ? void 0 : options.timeout);
-    }
-    else if ((options === null || options === void 0 ? void 0 : options.state) === 'visible') {
-        const element = await findElement(driver, selector);
+    if ((options === null || options === void 0 ? void 0 : options.state) === 'visible') {
+        const element = await driver.findElement(selector);
         return driver.wait(Selenium.until.elementIsVisible(element), options === null || options === void 0 ? void 0 : options.timeout);
     }
+    else {
+        return driver.wait(Selenium.until.elementLocated(selector), options === null || options === void 0 ? void 0 : options.timeout);
+    }
 }
 exports.waitForSelector = waitForSelector;
 async function setElementText(driver, element, keys) {
-    if (isSelector(element))
-        element = await findElement(driver, element);
-    await element.clear();
-    await element.sendKeys(keys);
+    const resolvedElement = isSelector(element) ? await findElement(driver, element) : element;
+    await (resolvedElement === null || resolvedElement === void 0 ? void 0 : resolvedElement.clear());
+    await (resolvedElement === null || resolvedElement === void 0 ? void 0 : resolvedElement.sendKeys(keys));
 }
 exports.setElementText = setElementText;
 async function getElementText(_driver, element) {
@@ -286,28 +284,25 @@ async function takeScreenshot(driver) {
 }
 exports.takeScreenshot = takeScreenshot;
 async function click(driver, element) {
-    if (isSelector(element))
-        element = await findElement(driver, element);
-    await element.click();
+    const resolvedElement = isSelector(element) ? await findElement(driver, element) : element;
+    await (resolvedElement === null || resolvedElement === void 0 ? void 0 : resolvedElement.click());
 }
 exports.click = click;
 async function hover(driver, element) {
-    if (isSelector(element))
-        element = await findElement(driver, element);
+    const resolvedElement = isSelector(element) ? await findElement(driver, element) : element;
     if (process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3') {
         const { ActionSequence } = require('selenium-webdriver');
         const action = new ActionSequence(driver);
-        await action.mouseMove(element).perform();
+        await action.mouseMove(resolvedElement).perform();
     }
     else {
-        await driver.actions().move({ origin: element }).perform();
+        await driver.actions().move({ origin: resolvedElement }).perform();
     }
 }
 exports.hover = hover;
 async function scrollIntoView(driver, element, align = false) {
-    if (isSelector(element))
-        element = await findElement(driver, element);
-    await driver.executeScript('arguments[0].scrollIntoView(arguments[1])', element, align);
+    const resolvedElement = isSelector(element) ? await findElement(driver, element) : element;
+    await driver.executeScript('arguments[0].scrollIntoView(arguments[1])', resolvedElement, align);
 }
 exports.scrollIntoView = scrollIntoView;
 async function waitUntilDisplayed(driver, selector, timeout) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/spec-driver-selenium",
-  "version": "1.5.25",
+  "version": "1.5.26",
   "keywords": [
     "selenium",
     "selenium-webdriver",
@@ -41,12 +41,12 @@
     "types"
   ],
   "scripts": {
-    "lint": "eslint '**/*.ts'",
-    "build": "ttsc",
+    "lint": "node ../../node_modules/.bin/eslint '**/*.ts'",
+    "build": "node ../../node_modules/.bin/ttsc --project ./tsconfig.build.json",
     "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:setup": "node ../../scripts/generate-docker-compose-config.js && docker-compose up -d",
     "docker:teardown": "docker-compose down",
     "upgrade:framework": "if [ ! -z $APPLITOOLS_SELENIUM_MAJOR_VERSION ]; then packagejson=`cat package.json`; yarn upgrade --no-lockfile selenium-webdriver@$APPLITOOLS_SELENIUM_MAJOR_VERSION; echo \"$packagejson\" > package.json; fi",
     "deps": "bongo deps",
@@ -56,38 +56,20 @@
     "version": "bongo version",
     "postversion": "bongo postversion --skip-release-notification"
   },
-  "husky": {
-    "hooks": {
-      "pre-push": "yarn bongo lint"
-    }
-  },
   "dependencies": {
-    "@applitools/driver": "1.11.26",
-    "@applitools/utils": "1.3.28"
+    "@applitools/driver": "1.11.28",
+    "@applitools/utils": "1.3.30"
   },
   "devDependencies": {
     "@applitools/api-extractor": "^1.2.11",
     "@applitools/bongo": "2.2.2",
-    "@applitools/scripts": "1.2.0",
-    "@applitools/test-utils": "1.5.10",
+    "@applitools/test-utils": "1.5.12",
     "@types/mocha": "^9.1.1",
     "@types/node": "12",
     "@types/selenium-webdriver": "^4.1.1",
-    "@typescript-eslint/eslint-plugin": "^5.27.0",
-    "@typescript-eslint/parser": "^5.27.0",
-    "eslint": "^8.16.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-mocha-no-only": "^1.1.1",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "husky": "^4.3.7",
     "mocha": "^9.2.2",
     "nock": "^13.2.9",
-    "prettier": "^2.6.2",
-    "selenium-webdriver": "4.4.0",
-    "ts-node": "^10.8.0",
-    "ttypescript": "^1.5.13",
-    "typescript": "^4.7.2"
+    "selenium-webdriver": "4.4.0"
   },
   "peerDependencies": {
     "selenium-webdriver": ">=3.6.0"

package/types/index.d.ts

@@ -4,23 +4,23 @@ 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: string | { selector: string | Selector; type?: string; }): Selector;
-export function untransformSelector(selector: Selector): string | { selector: string; type?: string; };
+export function transformSelector(selector: string | { selector: string | Selector; type?: undefined | string; }): Selector;
+export function untransformSelector(selector: Selector): null | (string | { selector: string; type?: undefined | 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>;
 export function mainContext(driver: Driver): Promise<Driver>;
 export function parentContext(driver: Driver): Promise<Driver>;
 export function childContext(driver: Driver, element: Element): Promise<Driver>;
-export function findElement(driver: Driver, selector: Selector, parent?: Element): Promise<Element>;
-export function findElements(driver: Driver, selector: Selector, parent?: Element): Promise<Array<Element>>;
-export function waitForSelector(driver: Driver, selector: Selector, _parent?: Element, options?: import('@applitools/driver').WaitOptions): Promise<Element>;
+export function findElement(driver: Driver, selector: Selector, parent?: undefined | Element): Promise<null | Element>;
+export function findElements(driver: Driver, selector: Selector, parent?: undefined | Element): Promise<Array<Element>>;
+export function waitForSelector(driver: Driver, selector: Selector, _parent?: undefined | Element, options?: undefined | import('@applitools/driver').WaitOptions): Promise<null | Element>;
 export function setElementText(driver: Driver, element: Element | Selector, keys: string): Promise<void>;
 export function getElementText(_driver: Driver, element: Element): Promise<string>;
 export function getWindowSize(driver: Driver): Promise<{ width: number; height: number; }>;
 export function setWindowSize(driver: Driver, size: { width: number; height: number; }): Promise<void>;
 export function getSessionMetadata(driver: Driver): Promise<void | []>;
-export function getCookies(driver: Driver, context?: boolean): Promise<Array<import('@applitools/driver').Cookie>>;
+export function getCookies(driver: Driver, context?: undefined | boolean): Promise<Array<import('@applitools/driver').Cookie>>;
 export function getDriverInfo(driver: Driver): Promise<import('@applitools/driver').DriverInfo>;
 export function getCapabilities(driver: Driver): Promise<Record<string, any>>;
 export function getTitle(driver: Driver): Promise<string>;
@@ -45,7 +45,7 @@ export function getSystemBars(driver: Driver): Promise<{ statusBar: {
     width: number;
 }; }>;
 export function setOrientation(driver: Driver, orientation: import('@applitools/driver').ScreenOrientation): Promise<void>;
-export function getOrientation(driver: Driver): Promise<"portrait" | "landscape">;
+export function getOrientation(driver: Driver): Promise<"landscape" | "portrait">;
 export function getElementRegion(_driver: Driver, element: Element): Promise<{
     x: number;
     y: number;
@@ -57,7 +57,7 @@ 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; };
-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; };
+export function build(__0: any): Promise<[import('selenium-webdriver').WebDriver & { __applitoolsBrand?: undefined; } & { __serverUrl?: undefined | string; }, () => Promise<void>]>;
+export type Driver = import('selenium-webdriver').WebDriver & { __applitoolsBrand?: undefined; };
+export type Element = import('selenium-webdriver').WebElement & { __applitoolsBrand?: undefined; };
+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?: undefined; };