@applitools/spec-driver-selenium 1.5.47 → 1.5.48

package/CHANGELOG.md

@@ -0,0 +1,12 @@
+# Changelog
+
+## [1.5.48](https://github.com/applitools/eyes.sdk.javascript1/compare/js/spec-driver-selenium-v1.5.47...js/spec-driver-selenium@1.5.48) (2023-06-13)
+
+
+### Dependencies
+
+* update some dependencies
+* The following workspace dependencies were updated
+  * dependencies
+    * @applitools/driver bumped from 1.12.1 to 1.12.2
+    * @applitools/utils bumped from 1.3.37 to 1.4.0

package/dist/index.js

@@ -27,11 +27,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const spec = __importStar(require("./spec-driver"));
-if (!process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION) {
+if (!process.env.APPLITOOLS_FRAMEWORK_MAJOR_VERSION) {
     try {
-        const { version } = require('selenium-webdriver/package.json');
+        const version = process.env.APPLITOOLS_FRAMEWORK_VERSION || require('selenium-webdriver/package.json').version;
         const [major] = version.split('.', 1);
-        process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION = major;
+        process.env.APPLITOOLS_FRAMEWORK_MAJOR_VERSION = major;
     }
     catch {
         // NOTE: ignore error

package/dist/spec-driver.js

@@ -41,7 +41,7 @@ function isByHashSelector(selector) {
     return byHash.includes(Object.keys(selector)[0]);
 }
 async function executeCustomCommand(driver, command) {
-    return process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3'
+    return process.env.APPLITOOLS_FRAMEWORK_MAJOR_VERSION === '3'
         ? driver.schedule(command)
         : driver.execute(command);
 }
@@ -77,7 +77,7 @@ function transformDriver(driver) {
     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') {
+    if (process.env.APPLITOOLS_FRAMEWORK_MAJOR_VERSION === '3') {
         driver.getExecutor().defineCommand('switchToParentFrame', 'POST', '/session/:sessionId/frame/parent');
     }
     return driver;
@@ -143,7 +143,7 @@ async function mainContext(driver) {
 }
 exports.mainContext = mainContext;
 async function parentContext(driver) {
-    if (process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3') {
+    if (process.env.APPLITOOLS_FRAMEWORK_MAJOR_VERSION === '3') {
         await executeCustomCommand(driver, new command_1.Command('switchToParentFrame'));
         return driver;
     }
@@ -283,7 +283,7 @@ async function click(driver, element) {
 exports.click = click;
 async function hover(driver, element) {
     const resolvedElement = isSelector(element) ? await findElement(driver, element) : element;
-    if (process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3') {
+    if (process.env.APPLITOOLS_FRAMEWORK_MAJOR_VERSION === '3') {
         const { ActionSequence } = require('selenium-webdriver');
         const action = new ActionSequence(driver);
         await action.mouseMove(resolvedElement).perform();
@@ -360,11 +360,18 @@ const browserOptionsNames = {
  * When wiring the spec-driver up to an SDK and calling this function, if you don't have the same dev deps
  * installed in the SDK, then this function will error.
  */
-async function build({ selenium, ...env }) {
+async function build(env) {
     var _a;
-    const { Builder } = (selenium !== null && selenium !== void 0 ? selenium : require('selenium-webdriver'));
+    let frameworkPath;
+    try {
+        frameworkPath = require.resolve('selenium-webdriver', { paths: [`${process.cwd()}/node_modules`] });
+    }
+    catch {
+        frameworkPath = 'selenium-webdriver';
+    }
+    const { Builder } = require(frameworkPath);
     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 { 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_FRAMEWORK_MAJOR_VERSION === '3' });
     const desiredCapabilities = { ...capabilities };
     if (configurable) {
         const browserOptionsName = browserOptionsNames[browser || desiredCapabilities.browserName];
@@ -385,7 +392,7 @@ async function build({ selenium, ...env }) {
         if (appium) {
             desiredCapabilities['appium:chromeOptions'] = { w3c: false, ...desiredCapabilities['appium:chromeOptions'] };
         }
-        else if (process.env.APPLITOOLS_SELENIUM_MAJOR_VERSION === '3') {
+        else if (process.env.APPLITOOLS_FRAMEWORK_MAJOR_VERSION === '3') {
             desiredCapabilities['goog:chromeOptions'] = { w3c: false, ...desiredCapabilities['goog:chromeOptions'] };
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/spec-driver-selenium",
-  "version": "1.5.47",
+  "version": "1.5.48",
   "keywords": [
     "selenium",
     "selenium-webdriver",
@@ -25,9 +25,6 @@
     "name": "Applitools Team",
     "email": "team@applitools.com"
   },
-  "aliases": [
-    "spec-selenium"
-  ],
   "exports": {
     ".": {
       "types": "./types/index.d.ts",
@@ -41,29 +38,19 @@
     "types"
   ],
   "scripts": {
-    "lint": "node ../../node_modules/.bin/eslint '**/*.ts'",
-    "build": "node ../../node_modules/.bin/tspc --project ./tsconfig.build.json",
-    "test": "node ../../node_modules/.bin/mocha './test/**/*.spec.ts' -r @applitools/test-utils/mocha-hooks/docker --exit",
-    "test:sanity": "yarn test",
-    "setup": "yarn docker:setup",
-    "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",
-    "gh:test": "gh workflow run test.yml --ref $(git rev-parse --abbrev-ref HEAD) -f packages='spec-selenium spec-selenium@3' -f links='types utils test-utils'",
-    "gh:publish": "gh workflow run publish-spec-selenium.yml --ref $(git rev-parse --abbrev-ref HEAD)",
-    "preversion": "bongo preversion",
-    "version": "bongo version",
-    "postversion": "bongo postversion"
+    "lint": "run --top-level eslint '**/*.ts'",
+    "build": "run --top-level tspc --project ./tsconfig.build.json",
+    "test": "run --top-level mocha './test/**/*.spec.ts' -r @applitools/test-utils/mocha-hooks/docker --exit",
+    "setup": "run --top-level browsers:setup",
+    "up:framework": "run --top-level add-silent selenium-webdriver"
   },
   "dependencies": {
-    "@applitools/driver": "1.12.1",
-    "@applitools/utils": "1.3.37"
+    "@applitools/driver": "1.12.2",
+    "@applitools/utils": "1.4.0"
   },
   "devDependencies": {
     "@applitools/api-extractor": "^1.2.21",
-    "@applitools/bongo": "4.0.0",
-    "@applitools/test-utils": "1.5.17",
+    "@applitools/test-utils": "^1.5.17",
     "@types/node": "^12.20.55",
     "@types/selenium-webdriver": "^4.1.1",
     "nock": "^13.2.9",
@@ -75,4 +62,4 @@
   "engines": {
     "node": ">=12.13.0"
   }
-}
+}

package/types/index.d.ts

@@ -55,7 +55,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?: undefined; } & { __serverUrl?: undefined | string; }, () => Promise<void>]>;
+export function build(env: 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 ShadowRoot = { 'shadow-6066-11e4-a52e-4f735466cecf': string; };