@applitools/driver 1.11.32 → 1.11.33

package/dist/driver.js

@@ -39,6 +39,7 @@ class Driver {
     constructor(options) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         this._driverInfo = {};
+        this._state = {};
         this._customConfig = {};
         this._customConfig = (_a = options.customConfig) !== null && _a !== void 0 ? _a : {};
         this._spec = options.spec;
@@ -189,8 +190,13 @@ class Driver {
         if (this.isMobile) {
             this._driverInfo.orientation =
                 (_l = (await this.getOrientation().catch(() => undefined))) !== null && _l !== void 0 ? _l : this._driverInfo.orientation;
-            const world = await this.getCurrentWorld();
-            this._driverInfo.isWebView = !!(world === null || world === void 0 ? void 0 : world.isWebView);
+            if (this.isWeb) {
+                const world = await this.getCurrentWorld();
+                if (world) {
+                    const [home] = (await this.getWorlds());
+                    this._driverInfo.isWebView = world !== home;
+                }
+            }
         }
         if (this.isWeb) {
             const browserInfo = await this.currentContext.executePoll(snippets.getBrowserInfo);
@@ -335,6 +341,34 @@ class Driver {
         this._logger.log(`Returning helper for of type ${(_c = (_b = this._helper) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : null}`);
         return this._helper;
     }
+    async extractBrokerUrl() {
+        if (this._state.brokerUrl)
+            return this._state.brokerUrl;
+        if (!this.isNative)
+            return null;
+        this._logger.log('Broker url extraction is started');
+        const element = await this.element({ type: 'accessibility id', selector: 'Applitools_View' });
+        if (!element)
+            return null;
+        try {
+            let result;
+            do {
+                result = JSON.parse(await element.getText());
+                if (result.nextPath) {
+                    this._logger.log('Broker url was extraction finished successfully with value', result.nextPath);
+                    this._state.brokerUrl = result.nextPath;
+                    return this._state.brokerUrl;
+                }
+                await utils.general.sleep(1000);
+            } while (!result.error);
+            this._logger.error('Broker url extraction has failed with error', result.error);
+            return null;
+        }
+        catch (error) {
+            this._logger.error('Broker url extraction has failed with error', error);
+            return null;
+        }
+    }
     // begin world
     //
     // About the concept of a  "World":
@@ -353,69 +387,73 @@ class Driver {
     // - the native app world can be switched to (with the `goHome` option)
     async switchWorld(options) {
         var _a, _b;
-        if ((options === null || options === void 0 ? void 0 : options.restoreState) && !this._previousWorld)
+        if ((options === null || options === void 0 ? void 0 : options.restoreState) && !this._state.world)
             return;
         if (!this._spec.getCurrentWorld || !this._spec.switchWorld) {
             this._logger.warn('world switching not implemented in the spec driver, skipping');
             return;
         }
         this._logger.log('switchWorld called with', options ? options : 'no options');
-        const { id, home, next } = await this.getCurrentWorld();
-        if (!this._previousWorld) {
-            this._logger.log('storing current world id for future restoration', id);
-            this._previousWorld = id;
-        }
-        const providedTarget = (options === null || options === void 0 ? void 0 : options.restoreState)
-            ? this._previousWorld
-            : (options === null || options === void 0 ? void 0 : options.goHome)
-                ? home
-                : (options === null || options === void 0 ? void 0 : options.id)
-                    ? options.id
-                    : next;
-        this._logger.log('switching world with', providedTarget ? providedTarget : 'no id');
+        const current = (await this.getCurrentWorld());
+        if (!this._state.world) {
+            this._logger.log('storing current world id for future restoration', current);
+            this._state.world = current;
+        }
+        let world;
+        if (options === null || options === void 0 ? void 0 : options.id)
+            world = options.id;
+        else if (options === null || options === void 0 ? void 0 : options.restoreState)
+            world = this._state.world;
+        else {
+            const [home, next] = (await this.getWorlds());
+            if (options === null || options === void 0 ? void 0 : options.goHome)
+                world = home;
+            else
+                world = next;
+        }
+        this._logger.log('switching world with', world);
         try {
-            await ((_b = (_a = this._spec).switchWorld) === null || _b === void 0 ? void 0 : _b.call(_a, this.target, providedTarget));
+            await ((_b = (_a = this._spec).switchWorld) === null || _b === void 0 ? void 0 : _b.call(_a, this.target, world));
             await this.init();
         }
         catch (error) {
             throw new Error(`Unable to switch worlds, the original error was: ${error.message}`);
         }
     }
-    async getWorlds(attempt = 1) {
-        var _a, _b;
+    async getWorlds() {
         if (!this._spec.getWorlds)
-            return [];
-        this._logger.log('attempting to find worlds');
-        await utils.general.sleep(500);
-        const worlds = await ((_b = (_a = this._spec).getWorlds) === null || _b === void 0 ? void 0 : _b.call(_a, this.target));
-        if (!worlds[1]) {
-            if (attempt > 5) {
-                this._logger.warn(`just one world found - ${worlds}. done looking.`);
-                return worlds;
+            return null;
+        this._logger.log('Extracting worlds');
+        try {
+            let worlds = [];
+            for (let attempt = 0; worlds.length <= 1 && attempt < 5; ++attempt) {
+                if (attempt > 0)
+                    await utils.general.sleep(500);
+                worlds = await this._spec.getWorlds(this.target);
             }
-            this._logger.log(`just one world found, retrying to see if there are others (attempt #${attempt})`);
-            await this.getWorlds(attempt + 1);
+            this._logger.log('Worlds were extracted', worlds);
+            return worlds;
+        }
+        catch (error) {
+            this._logger.warn('Worlds were not extracted due to the error', error);
+            return null;
         }
-        this._logger.log(`worlds found - ${worlds}`);
-        return worlds;
     }
     async getCurrentWorld() {
         var _a, _b;
         if (!this._spec.getCurrentWorld)
-            return undefined;
-        const [origin, next] = await this.getWorlds();
-        const currentWorld = await ((_b = (_a = this._spec).getCurrentWorld) === null || _b === void 0 ? void 0 : _b.call(_a, this.target));
-        const result = {
-            id: currentWorld,
-            home: origin,
-            next,
-            isNative: currentWorld === origin,
-            isWebView: currentWorld !== origin,
-        };
-        this._logger.log('current world', result);
-        return result;
+            return null;
+        try {
+            this._logger.log('Extracting current world');
+            const current = await ((_b = (_a = this._spec).getCurrentWorld) === null || _b === void 0 ? void 0 : _b.call(_a, this.target));
+            this._logger.log('Current world was extracted', current);
+            return current;
+        }
+        catch (error) {
+            this._logger.warn('Current world was not extracted due to the error', error);
+            return null;
+        }
     }
-    // end world
     async getSessionMetadata() {
         var _a, _b;
         if (this.isECClient)

package/dist/fake/spec-driver.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.visit = exports.getTitle = exports.getUrl = exports.getOrientation = exports.setWindowSize = exports.getWindowSize = exports.getDriverInfo = exports.takeScreenshot = exports.childContext = exports.parentContext = exports.mainContext = exports.findElements = exports.findElement = exports.executeScript = exports.isEqualElements = exports.isStaleElementError = exports.extractSelector = exports.untransformSelector = exports.transformSelector = exports.isSelector = exports.isElement = exports.isDriver = void 0;
+exports.visit = exports.getTitle = exports.getUrl = exports.getOrientation = exports.setWindowSize = exports.getWindowSize = exports.getDriverInfo = exports.takeScreenshot = exports.childContext = exports.parentContext = exports.mainContext = exports.getElementText = exports.findElements = exports.findElement = exports.executeScript = exports.isEqualElements = exports.isStaleElementError = exports.extractSelector = exports.untransformSelector = exports.transformSelector = exports.isSelector = exports.isElement = exports.isDriver = void 0;
 const utils = __importStar(require("@applitools/utils"));
 function isDriver(driver) {
     return driver && driver.constructor.name === 'MockDriver';
@@ -84,6 +84,11 @@ async function findElements(driver, selector, parent) {
     return driver.findElements(selector, parent);
 }
 exports.findElements = findElements;
+async function getElementText(_driver, element) {
+    var _a;
+    return (_a = element.attrs) === null || _a === void 0 ? void 0 : _a.text;
+}
+exports.getElementText = getElementText;
 async function mainContext(driver) {
     return driver.switchToFrame(null);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/driver",
-  "version": "1.11.32",
+  "version": "1.11.33",
   "description": "Applitools universal framework wrapper",
   "keywords": [
     "applitools",

package/types/driver.d.ts

@@ -21,10 +21,10 @@ export declare class Driver<T extends SpecType> {
     private _mainContext;
     private _currentContext;
     private _driverInfo;
+    private _helper?;
+    private _state;
     private _logger;
     private _customConfig;
-    private _helper?;
-    private _previousWorld?;
     protected readonly _spec: SpecDriver<T>;
     constructor(options: DriverOptions<T>);
     get target(): T['driver'];
@@ -65,19 +65,14 @@ export declare class Driver<T extends SpecType> {
     updateCurrentContext(context: Context<T>): void;
     init(): Promise<this>;
     getHelper(): Promise<HelperAndroid<T> | HelperIOS<T> | null>;
+    extractBrokerUrl(): Promise<string | null>;
     switchWorld(options?: {
         id?: string;
         restoreState?: boolean;
         goHome?: boolean;
     }): Promise<void>;
-    getWorlds(attempt?: number): Promise<string[]>;
-    getCurrentWorld(): Promise<{
-        id: string;
-        home: string;
-        next?: string;
-        isNative: boolean;
-        isWebView: boolean;
-    }>;
+    getWorlds(): Promise<string[] | null>;
+    getCurrentWorld(): Promise<string | null>;
     getSessionMetadata(): Promise<any>;
     refreshContexts(): Promise<Context<T>>;
     switchTo(context: Context<T>): Promise<Context<T>>;

package/types/fake/spec-driver.d.ts

@@ -22,8 +22,9 @@ export declare function extractSelector(element: Element): any;
 export declare function isStaleElementError(): boolean;
 export declare function isEqualElements(_driver: Driver, element1: Element, element2: Element): Promise<boolean>;
 export declare function executeScript(driver: Driver, script: ((arg: any) => any) | string, arg: any): Promise<any>;
-export declare function findElement(driver: Driver, selector: Selector, parent?: Element): Promise<Element>;
+export declare function findElement(driver: Driver, selector: Selector, parent?: Element): Promise<Element | null>;
 export declare function findElements(driver: Driver, selector: Selector, parent?: Element): Promise<Element[]>;
+export declare function getElementText(_driver: Driver, element: Element): Promise<string>;
 export declare function mainContext(driver: Driver): Promise<Driver>;
 export declare function parentContext(driver: Driver): Promise<Driver>;
 export declare function childContext(driver: Driver, element: Element): Promise<Driver>;