@applitools/driver 1.14.3 → 1.15.0

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## [1.15.0](https://github.com/applitools/eyes.sdk.javascript1/compare/js/driver@1.14.4...js/driver@1.15.0) (2023-11-07)
+
+
+### Features
+
+* added warning when driver used with capabilities that may conflict with applitools lib workflow ([#2011](https://github.com/applitools/eyes.sdk.javascript1/issues/2011)) ([081006d](https://github.com/applitools/eyes.sdk.javascript1/commit/081006d879894db03a2713129b66586496b6eb02))
+
+## [1.14.4](https://github.com/applitools/eyes.sdk.javascript1/compare/js/driver@1.14.3...js/driver@1.14.4) (2023-10-17)
+
+
+### Code Refactoring
+
+* disallow usage of global Buffer ([#1957](https://github.com/applitools/eyes.sdk.javascript1/issues/1957)) ([adcc082](https://github.com/applitools/eyes.sdk.javascript1/commit/adcc082f20f6b92e819b96424e995d9a69d99758))
+
+
+### Dependencies
+
+* @applitools/utils bumped to 1.6.2
+  #### Code Refactoring
+
+  * disallow usage of global Buffer ([#1957](https://github.com/applitools/eyes.sdk.javascript1/issues/1957)) ([adcc082](https://github.com/applitools/eyes.sdk.javascript1/commit/adcc082f20f6b92e819b96424e995d9a69d99758))
+* @applitools/logger bumped to 2.0.12
+  #### Code Refactoring
+
+  * disallow usage of global Buffer ([#1957](https://github.com/applitools/eyes.sdk.javascript1/issues/1957)) ([adcc082](https://github.com/applitools/eyes.sdk.javascript1/commit/adcc082f20f6b92e819b96424e995d9a69d99758))
+
+
+
+
 ## [1.14.3](https://github.com/applitools/eyes.sdk.javascript1/compare/js/driver@1.14.2...js/driver@1.14.3) (2023-09-29)
 
 

package/dist/capabilities.js

@@ -51,13 +51,29 @@ function extractCapabilitiesEnvironment(capabilities) {
         environment.isAndroid = isAndroid(capabilities);
         if (!environment.browserName) {
             environment.isNative = true;
+            environment.applitoolsLib = { instrumented: false };
             if (environment.isAndroid) {
-                environment.isApplitoolsLib = !!((_t = capabilities.optionalIntentArguments) === null || _t === void 0 ? void 0 : _t.includes('APPLITOOLS_API_KEY'));
+                const optionalIntentArguments = (_t = capabilities['appium:optionalIntentArguments']) !== null && _t !== void 0 ? _t : capabilities.optionalIntentArguments;
+                environment.applitoolsLib.instrumented = !!(optionalIntentArguments === null || optionalIntentArguments === void 0 ? void 0 : optionalIntentArguments.includes('APPLITOOLS_API_KEY'));
             }
             else if (environment.isIOS) {
-                environment.isApplitoolsLib = utils.types.isString(capabilities.processArguments)
-                    ? capabilities.processArguments.includes('APPLITOOLS_API_KEY')
-                    : !!((_v = (_u = capabilities.processArguments) === null || _u === void 0 ? void 0 : _u.env) === null || _v === void 0 ? void 0 : _v.APPLITOOLS_API_KEY);
+                const processArguments = (_u = capabilities['appium:processArguments']) !== null && _u !== void 0 ? _u : capabilities.processArguments;
+                environment.applitoolsLib.instrumented = utils.types.isString(processArguments)
+                    ? processArguments.includes('APPLITOOLS_API_KEY')
+                    : !!((_v = processArguments === null || processArguments === void 0 ? void 0 : processArguments.env) === null || _v === void 0 ? void 0 : _v.APPLITOOLS_API_KEY);
+            }
+            if (environment.applitoolsLib.instrumented) {
+                const conflictingCapabilities = { fullReset: false, noReset: true, autoLaunch: false };
+                environment.applitoolsLib.conflictingCapabilities = Object.entries(conflictingCapabilities).reduce((conflictingCapabilities, [capability, value]) => {
+                    ;
+                    [capability, `appium:${capability}`].forEach(capability => {
+                        if (capabilities[capability] === value) {
+                            conflictingCapabilities !== null && conflictingCapabilities !== void 0 ? conflictingCapabilities : (conflictingCapabilities = {});
+                            conflictingCapabilities[capability] = value;
+                        }
+                    });
+                    return conflictingCapabilities;
+                }, undefined);
             }
         }
         else if (environment.isIOS &&

package/dist/context.js

@@ -145,7 +145,9 @@ class Context {
                 else if (selector.shadow && !features.nestedSelectors) {
                     elements = await elements.reduce((result, element) => {
                         return result.then(async (result) => {
-                            const root = await this._spec.executeScript(this.target, snippets.getShadowRoot, [element]);
+                            const root = await this._spec.executeScript(this.target, snippets.getShadowRoot, [
+                                element,
+                            ]);
                             return result.concat(root ? await this._findElements(selector.shadow, { parent: root, all, wait }) : []);
                         });
                     }, Promise.resolve([]));

package/dist/driver.js

@@ -27,6 +27,7 @@ exports.makeDriver = exports.isDriver = exports.isDriverInstance = exports.Drive
 const logger_1 = require("@applitools/logger");
 const context_1 = require("./context");
 const selector_1 = require("./selector");
+const buffer_1 = require("buffer");
 const helper_ios_1 = require("./helper-ios");
 const helper_android_1 = require("./helper-android");
 const user_agent_1 = require("./user-agent");
@@ -512,7 +513,7 @@ class Driver {
         }
         try {
             await this._spec.switchWorld(this.target, name);
-            this.refresh({ reset: true });
+            await this.refresh({ reset: true });
         }
         catch (error) {
             this._logger.error('Unable to switch world due to the error', error);
@@ -639,7 +640,7 @@ class Driver {
     async takeScreenshot() {
         const image = await this._spec.takeScreenshot(this.target);
         if (utils.types.isString(image)) {
-            return Buffer.from(image.replace(/[\r\n]+/g, ''), 'base64');
+            return buffer_1.Buffer.from(image.replace(/[\r\n]+/g, ''), 'base64');
         }
         return image;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/driver",
-  "version": "1.14.3",
+  "version": "1.15.0",
   "description": "Applitools universal framework wrapper",
   "keywords": [
     "applitools",
@@ -73,9 +73,9 @@
     "test": "run --top-level mocha './test/**/*.spec.ts'"
   },
   "dependencies": {
-    "@applitools/logger": "2.0.11",
+    "@applitools/logger": "2.0.12",
     "@applitools/snippets": "2.4.24",
-    "@applitools/utils": "1.6.1",
+    "@applitools/utils": "1.6.2",
     "semver": "7.5.4"
   },
   "devDependencies": {

package/types/types.d.ts

@@ -32,7 +32,10 @@ export type Environment = {
     isW3C?: boolean;
     isEC?: boolean;
     isECClient?: boolean;
-    isApplitoolsLib?: boolean;
+    applitoolsLib?: {
+        instrumented: boolean;
+        conflictingCapabilities?: Partial<Capabilities>;
+    };
     isWeb?: boolean;
     isNative?: boolean;
     isMobile?: boolean;