@oracle/oraclejet-selenium-driver 17.1.8 → 18.1.6

package/UNSAFE_SeleniumDriver/SeleniumDriver.d.ts

@@ -0,0 +1,19 @@
+import type { KeyType, ClickOptions, TestDriver, TestElement } from '@oracle/oraclejet-testing/UNSAFE_driver';
+import { WebDriver } from 'selenium-webdriver';
+export declare class SeleniumDriver implements TestDriver {
+    private driver;
+    private platform;
+    constructor(driver: WebDriver);
+    executeScript<T>(script: string | (() => T), ...args: any): Promise<T>;
+    findElement(query: string): Promise<TestElement>;
+    findElements(query: string): Promise<TestElement[]>;
+    sendKeys(element: TestElement, ...text: (string | KeyType)[]): Promise<void>;
+    click(element: TestElement, options?: ClickOptions): Promise<void>;
+    private ensurePlatform;
+    /**
+     * Get the platform-specific key value for the key, if available.
+     * @param key The key value
+     * @returns A platform-specific value for the key, or the original key if none exists
+     */
+    private getPlatformKey;
+}

package/UNSAFE_SeleniumDriver/SeleniumDriver.js

@@ -0,0 +1,104 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SeleniumDriver = void 0;
+const UNSAFE_driver_1 = require("@oracle/oraclejet-testing/UNSAFE_driver");
+const selenium_webdriver_1 = require("selenium-webdriver");
+const modifierKeys = {
+    SHIFT: selenium_webdriver_1.Key.SHIFT,
+    CONTROL: selenium_webdriver_1.Key.CONTROL,
+    CONTROL_COMMAND: selenium_webdriver_1.Key.CONTROL,
+    ALT: selenium_webdriver_1.Key.ALT
+};
+const keyMap = {
+    ...modifierKeys,
+    BACKSPACE: selenium_webdriver_1.Key.BACK_SPACE,
+    TAB: selenium_webdriver_1.Key.TAB,
+    ENTER: selenium_webdriver_1.Key.ENTER,
+    ESCAPE: selenium_webdriver_1.Key.ESCAPE,
+    PAGE_UP: selenium_webdriver_1.Key.PAGE_UP,
+    PAGE_DOWN: selenium_webdriver_1.Key.PAGE_DOWN,
+    END: selenium_webdriver_1.Key.END,
+    HOME: selenium_webdriver_1.Key.HOME,
+    ARROW_LEFT: selenium_webdriver_1.Key.ARROW_LEFT,
+    ARROW_UP: selenium_webdriver_1.Key.ARROW_UP,
+    ARROW_RIGHT: selenium_webdriver_1.Key.ARROW_RIGHT,
+    ARROW_DOWN: selenium_webdriver_1.Key.ARROW_DOWN,
+    DELETE: selenium_webdriver_1.Key.DELETE,
+    F1: selenium_webdriver_1.Key.F1,
+    F2: selenium_webdriver_1.Key.F2,
+    F3: selenium_webdriver_1.Key.F3,
+    F4: selenium_webdriver_1.Key.F4,
+    F5: selenium_webdriver_1.Key.F5,
+    F6: selenium_webdriver_1.Key.F6,
+    F7: selenium_webdriver_1.Key.F7,
+    F8: selenium_webdriver_1.Key.F8,
+    F9: selenium_webdriver_1.Key.F9,
+    F10: selenium_webdriver_1.Key.F10,
+    F11: selenium_webdriver_1.Key.F11,
+    F12: selenium_webdriver_1.Key.F12
+};
+class SeleniumDriver {
+    constructor(driver) {
+        this.platform = '';
+        this.driver = driver;
+    }
+    executeScript(script, ...args) {
+        return this.driver.executeScript(script, ...args);
+    }
+    findElement(query) {
+        return this.driver.findElement(selenium_webdriver_1.By.css(query)).then(wrapElement);
+    }
+    findElements(query) {
+        return this.driver.findElements(selenium_webdriver_1.By.css(query)).then((els) => els.map(wrapElement));
+    }
+    async sendKeys(element, ...text) {
+        await this.ensurePlatform();
+        return element.el.sendKeys(...text.map(this.getPlatformKey.bind(this)));
+    }
+    async click(element, options = {}) {
+        await this.ensurePlatform();
+        const modifiers = options.modifiers || [];
+        const actions = this.driver.actions();
+        modifiers.map(this.getPlatformKey.bind(this)).forEach((m) => actions.keyDown(m));
+        await actions.click(element.el).perform();
+        return actions.clear();
+    }
+    async ensurePlatform() {
+        if (!this.platform) {
+            this.platform = (await this.driver.getCapabilities()).getPlatform() || 'unknown';
+        }
+    }
+    /**
+     * Get the platform-specific key value for the key, if available.
+     * @param key The key value
+     * @returns A platform-specific value for the key, or the original key if none exists
+     */
+    getPlatformKey(key) {
+        if (typeof key === 'object') {
+            return UNSAFE_driver_1.Keys['CONTROL_COMMAND'] === key
+                ? this.platform === 'mac'
+                    ? selenium_webdriver_1.Key.COMMAND
+                    : selenium_webdriver_1.Key.CONTROL
+                : keyMap[key.key];
+        }
+        return key;
+    }
+}
+exports.SeleniumDriver = SeleniumDriver;
+function wrapElement(element) {
+    return new ElementWrapper(element);
+}
+class ElementWrapper {
+    constructor(element) {
+        this.el = element;
+    }
+    findElement(query) {
+        return this.el.findElement(selenium_webdriver_1.By.css(query)).then(wrapElement);
+    }
+    findElements(query) {
+        return this.el.findElements(selenium_webdriver_1.By.css(query)).then((els) => els.map(wrapElement));
+    }
+    getAttribute(attrName) {
+        return this.el.getAttribute(attrName);
+    }
+}

package/UNSAFE_SeleniumDriver/index.d.ts

@@ -0,0 +1 @@
+export { SeleniumDriver } from './SeleniumDriver';

package/UNSAFE_SeleniumDriver/index.js

@@ -1,39 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SeleniumDriver = void 0;
-const selenium_webdriver_1 = require("selenium-webdriver");
-class SeleniumDriver {
-    constructor(driver) {
-        this.driver = driver;
-    }
-    executeScript(script, ...args) {
-        return this.driver.executeScript(script, ...args);
-    }
-    findElement(query) {
-        return this.driver.findElement(selenium_webdriver_1.By.css(query)).then(wrapElement);
-    }
-    findElements(query) {
-        return this.driver.findElements(selenium_webdriver_1.By.css(query)).then((els) => els.map(wrapElement));
-    }
-    sendKeys(element, text) {
-        return element.el.sendKeys(text);
-    }
-    click(element) {
-        return element.el.click();
-    }
-}
-exports.SeleniumDriver = SeleniumDriver;
-function wrapElement(element) {
-    return new ElementWrapper(element);
-}
-class ElementWrapper {
-    constructor(element) {
-        this.el = element;
-    }
-    findElement(query) {
-        return this.el.findElement(selenium_webdriver_1.By.css(query)).then(wrapElement);
-    }
-    findElements(query) {
-        return this.el.findElements(selenium_webdriver_1.By.css(query)).then((els) => els.map(wrapElement));
-    }
-}
+var SeleniumDriver_1 = require("./SeleniumDriver");
+Object.defineProperty(exports, "SeleniumDriver", { enumerable: true, get: function () { return SeleniumDriver_1.SeleniumDriver; } });

package/package.json

@@ -2,18 +2,26 @@
   "name": "@oracle/oraclejet-selenium-driver",
   "packageManager": "yarn@3.5.0",
   "dependencies": {
-    "@oracle/oraclejet-testing": "17.1.8"
+    "@oracle/oraclejet-testing": "18.1.6"
   },
   "devDependencies": {
+    "@jest/globals": "29.6.2",
+    "@oracle/oraclejet-internal-test-utils": "workspace:*",
     "@oracle/oraclejet-internal-ws-build": "workspace:^",
+    "@oracle/oraclejet-webdriver": "workspace:*",
     "copyfiles": "2.4.1",
+    "http-server": "~0.12.3",
+    "jest": "29.6.2",
     "rimraf": "3.0.2",
-    "typescript": "5.4.5"
+    "ts-jest": "29.1.0",
+    "typescript": "5.7.2"
   },
   "scripts": {
-    "build": "yarn clean; tsc --outDir dist/UNSAFE_SeleniumDriver --declarationDir dist/types && yarn copy-files",
+    "build": "yarn clean; tsc --outDir dist/UNSAFE_SeleniumDriver && yarn copy-files",
     "clean": "rimraf dist",
-    "copy-files": "mergeJson package.json src/package-overrides.json dist/package.json"
+    "copy-files": "mergeJson package.json src/package-overrides.json dist/package.json",
+    "test": "node test/jest-http-launcher.js --httpRoot=src --port=${WD_SERVER_PORT:-6008} --config=test/jest.config.js",
+    "test-ci-browser": "yarn test --headless"
   },
   "peerDependencies": {
     "selenium-webdriver": ">=3.6.0"
@@ -24,9 +32,9 @@
   "typesVersions": {
     "*": {
       "*": [
-        "./types/*/index.d.ts"
+        "./*/index.d.ts"
       ]
     }
   },
-  "version": "17.1.8"
+  "version": "18.1.6"
 }

package/types/index.d.ts

@@ -1,11 +0,0 @@
-import { TestDriver, TestElement } from '@oracle/oraclejet-testing/UNSAFE_driver';
-import { WebDriver } from 'selenium-webdriver';
-export declare class SeleniumDriver implements TestDriver {
-    private driver;
-    constructor(driver: WebDriver);
-    executeScript<T>(script: string, ...args: any): Promise<T>;
-    findElement(query: string): Promise<TestElement>;
-    findElements(query: string): Promise<TestElement[]>;
-    sendKeys(element: TestElement, text: string): Promise<void>;
-    click(element: TestElement): Promise<void>;
-}