ff-automationv2 2.2.34-beta.3 → 2.2.34-beta.4

package/dist/automation/actions/executor.d.ts

@@ -19,7 +19,7 @@ export declare class ActionExecutor implements IActionExecutor {
     navigate(url: string): Promise<void>;
     goBack(): Promise<void>;
     refresh(): Promise<void>;
-    switchToFrame(selector: string, frames: FrameMeta[], elementName: string, elementType: string, pageDOM: string, fireflinkIndex: string, usedElementNames?: string[]): Promise<void>;
+    switchToFrame(selector: string, frames: FrameMeta[], elementName: string, elementType: string, pageDOM: string, fireflinkIndex: string, usedElementNames?: string[], skipRecording?: boolean): Promise<void>;
     wait(time: string): Promise<void>;
     click(pageDOM: string, selector: string, fireflinkIndex: string, elementName: string, elementType: string): Promise<void>;
     clickUsingJS(pageDOM: string, selector: string, fireflinkIndex: string, elementName: string, elementType: string): Promise<void>;

package/dist/automation/actions/executor.js

@@ -424,7 +424,7 @@ class ActionExecutor {
             throw error;
         }
     }
-    async switchToFrame(selector, frames, elementName, elementType, pageDOM, fireflinkIndex, usedElementNames) {
+    async switchToFrame(selector, frames, elementName, elementType, pageDOM, fireflinkIndex, usedElementNames, skipRecording) {
         try {
             await (0, findElementUsingFF_js_1.findElementUsingFF)({
                 driver: this.driver,
@@ -437,7 +437,8 @@ class ActionExecutor {
                 fireflinkIndex,
                 elementGetter: this.elementGetter,
                 platform: this.platform,
-                usedElementNames
+                usedElementNames,
+                skipRecording
             });
         }
         catch (error) {

package/dist/core/helpers/elementSelectorResolver.d.ts

@@ -10,4 +10,4 @@ export declare function resolveElementSelector(doc: any, domInfo: any, fireflink
     doc: any;
     domInfo: any;
 }>;
-export declare function handleShadowAndIframe(driver: any, stepAction: string, selector: string, fireflinkIndex: string, domInfo: any, actionHandlers: Record<string, any>, elementName: string, elementType: string, usedElementNames?: string[]): Promise<ShadowIframeResult>;
+export declare function handleShadowAndIframe(driver: any, stepAction: string, selector: string, fireflinkIndex: string, domInfo: any, actionHandlers: Record<string, any>, elementName: string, elementType: string, usedElementNames?: string[], skipRecording?: boolean): Promise<ShadowIframeResult>;

package/dist/core/helpers/elementSelectorResolver.js

@@ -63,7 +63,7 @@ async function resolveElementSelector(doc, domInfo, fireflinkIndex, platform, dr
     selector = selector.replace(/\/div\[0\]\/div\[0\]/g, "/div[1]").replace(/\/div\[0\]/g, "/div[1]");
     return { selector, doc: updatedDoc, domInfo: updatedDomInfo };
 }
-async function handleShadowAndIframe(driver, stepAction, selector, fireflinkIndex, domInfo, actionHandlers, elementName, elementType, usedElementNames) {
+async function handleShadowAndIframe(driver, stepAction, selector, fireflinkIndex, domInfo, actionHandlers, elementName, elementType, usedElementNames, skipRecording) {
     let updatedStepAction = stepAction;
     let updatedSelector = selector;
     let iframeDomHtml = null;
@@ -83,6 +83,7 @@ async function handleShadowAndIframe(driver, stepAction, selector, fireflinkInde
                 pageDOM: domInfo.dom,
                 fireflinkIndex,
                 usedElementNames,
+                skipRecording,
             });
             return {
                 stepAction: updatedStepAction,
@@ -116,6 +117,7 @@ async function handleShadowAndIframe(driver, stepAction, selector, fireflinkInde
                 pageDOM: domInfo.dom,
                 fireflinkIndex,
                 usedElementNames,
+                skipRecording,
             });
             return {
                 stepAction: updatedStepAction,

package/dist/core/main/actionHandlerFactory.js

@@ -389,7 +389,7 @@ function createActionHandlers(context) {
             await executor.wait(result.value);
         }),
         switchToFrame: withExecutor(async (executor, result) => {
-            await executor.switchToFrame(result.selector, result.frames, result.elementName, result.elementType, result.pageDOM, result.fireflinkIndex, result.usedElementNames);
+            await executor.switchToFrame(result.selector, result.frames, result.elementName, result.elementType, result.pageDOM, result.fireflinkIndex, result.usedElementNames, result.skipRecording);
         }),
         Click: withExecutor(async (executor, result) => {
             await executor.click(result.pageDOM, result.selector, result.fireflinkIndex, result.elementName, result.elementType);

package/dist/core/main/runAutomationScript.js

@@ -560,6 +560,7 @@ class AutomationRunner {
                         continue;
                     }
                     baseStepActionBeforeFallback = stepAction;
+                    let iframeSwitchRecorded = false;
                     for (let fallbackAttempt = 1; fallbackAttempt <= 2; fallbackAttempt++) {
                         let shadowIframeResult = null;
                         try {
@@ -622,7 +623,10 @@ class AutomationRunner {
                                 logData_js_1.logger.info(`Unable to resolve xpath for ${fireflinkIndex}`);
                                 throw new Error(`Unable to resolve xpath for ${fireflinkIndex}`);
                             }
-                            shadowIframeResult = await (0, elementSelectorResolver_js_1.handleShadowAndIframe)(driver, stepAction, selector, fireflinkIndex, domInfo, actionHandlers, currentElementName || result.response.elementName, stepResult.response.elementType, usedElementNames);
+                            shadowIframeResult = await (0, elementSelectorResolver_js_1.handleShadowAndIframe)(driver, stepAction, selector, fireflinkIndex, domInfo, actionHandlers, currentElementName || result.response.elementName, stepResult.response.elementType, usedElementNames, iframeSwitchRecorded);
+                            if (shadowIframeResult?.isIframe) {
+                                iframeSwitchRecorded = true;
+                            }
                             if (!shadowIframeResult.handled) {
                                 return;
                             }

package/dist/utils/iframesExtraction/findElementUsingFF.js

@@ -7,9 +7,23 @@ const elementSelectorResolver_js_1 = require("../../core/helpers/elementSelector
 const findElementUsingFF = async (args) => {
     await args.driver.switchFrame(null);
     const usedElementNames = args.usedElementNames || [];
-    for (const frameMeta of args.frames) {
+    const uniqueFrames = [];
+    for (const frame of args.frames || []) {
+        const isDuplicate = uniqueFrames.some(existing => (frame.id && existing.id === frame.id) ||
+            (frame.name && existing.name === frame.name) ||
+            (frame.title && existing.title === frame.title) ||
+            (frame.aria && existing.aria === frame.aria) ||
+            (frame.src && existing.src === frame.src));
+        if (!isDuplicate) {
+            uniqueFrames.push(frame);
+        }
+    }
+    for (const frameMeta of uniqueFrames) {
         const xpathUsed = await (0, switchToIframeByMeta_js_1.switchToIframeByMeta)(args.driver, frameMeta);
         if (xpathUsed) {
+            if (args.skipRecording) {
+                continue;
+            }
             const baseName = args.elementName ? args.elementName.trim().replace(/\s+/g, "-") : args.elementName;
             const finalElementName = ((0, elementSelectorResolver_js_1.generateUniqueName)(baseName, usedElementNames, "-iframe") || baseName)?.replace(/\s+/g, "-");
             (0, appendScriptData_js_1.appendScriptData)({

package/dist/utils/iframesExtraction/iframeInterface.d.ts

@@ -19,4 +19,5 @@ export interface IFindElementUsingFF {
     fireflinkIndex: string;
     elementGetter: ElementGetter;
     usedElementNames?: string[];
+    skipRecording?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ff-automationv2",
-  "version": "2.2.34-beta.3",
+  "version": "2.2.34-beta.4",
   "private": false,
   "type": "commonjs",
   "description": "This lib is used to automate the manual testcase",