ff-automationv2 2.2.27 → 2.2.29

package/dist/automation/actions/interaction/alert/clickCancelOnAlertPopup.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clickCancelOnAlertPopup = clickCancelOnAlertPopup;
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 async function clickCancelOnAlertPopup(args) {
     try {
         await args.driver.dismissAlert();
-        args.scriptDataAppender.add(async () => ({
+        (0, appendScriptData_js_1.appendScriptData)({
+            scriptDataAppender: args.scriptDataAppender,
             nlpName: "ClickCancelOnAlertPopup",
-            elementsData: [],
-            stepInputs: []
-        }));
+        });
     }
     catch (error) {
         args.scriptDataAppender.setErrorNLP("ClickCancelOnAlertPopup");

package/dist/automation/actions/interaction/alert/clickOkOnAlertPopup.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clickOkOnAlertPopup = clickOkOnAlertPopup;
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 async function clickOkOnAlertPopup(args) {
     try {
         await args.driver.acceptAlert();
-        args.scriptDataAppender.add(async () => ({
+        (0, appendScriptData_js_1.appendScriptData)({
+            scriptDataAppender: args.scriptDataAppender,
             nlpName: "ClickOkOnAlertPopup",
-            stepInputs: [],
-            elementsData: []
-        }));
+        });
     }
     catch (error) {
         args.scriptDataAppender.setErrorNLP("ClickOkOnAlertPopup");

package/dist/automation/actions/interaction/alert/enterDataToAlert.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enterDataToAlert = enterDataToAlert;
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 async function enterDataToAlert(args) {
     try {
         await args.driver.sendAlertText(args.value);
-        args.scriptDataAppender.add(async () => ({
+        (0, appendScriptData_js_1.appendScriptData)({
+            scriptDataAppender: args.scriptDataAppender,
             nlpName: "EnterDataToAlert",
             stepInputs: [args.value],
-            elementsData: []
-        }));
+        });
     }
     catch (error) {
         args.scriptDataAppender.setErrorNLP("EnterDataToAlert");

package/dist/automation/actions/interaction/alert/getTextPresentOnAlertPopup.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTextPresentOnAlertPopup = getTextPresentOnAlertPopup;
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 async function getTextPresentOnAlertPopup(args) {
     try {
-        args.scriptDataAppender.add(async () => ({
+        (0, appendScriptData_js_1.appendScriptData)({
+            scriptDataAppender: args.scriptDataAppender,
             nlpName: "GetTextPresentOnAlertPopup",
-            stepInputs: [],
-            elementsData: []
-        }));
+        });
     }
     catch (error) {
         args.scriptDataAppender.setErrorNLP("GetTextPresentOnAlertPopup");

package/dist/automation/actions/interaction/alert/verifyAlertPopUpMessageContainsString.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifyAlertPopUpMessageContainsString = verifyAlertPopUpMessageContainsString;
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 async function verifyAlertPopUpMessageContainsString(args) {
     try {
         const alertText = await args.driver.getAlertText();
         if (alertText.toLowerCase().includes(args.value.toLowerCase())) {
-            args.scriptDataAppender.add(async () => ({
+            (0, appendScriptData_js_1.appendScriptData)({
+                scriptDataAppender: args.scriptDataAppender,
                 nlpName: "VerifyAlertPopUpMessageContainsString",
                 stepInputs: [args.value],
-                elementsData: []
-            }));
+            });
         }
         else {
             args.scriptDataAppender.setErrorNLP("VerifyAlertPopUpMessageContainsString");

package/dist/automation/actions/interaction/alert/verifyAlertPopupIsDisplayed.js

@@ -1,13 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifyAlertPopupIsDisplayed = verifyAlertPopupIsDisplayed;
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 async function verifyAlertPopupIsDisplayed(args) {
     try {
-        args.scriptDataAppender.add(async () => ({
+        let value = "5";
+        if (args.value) {
+            value = args.value;
+        }
+        await args.driver.pause(Number(value) * 1000);
+        (0, appendScriptData_js_1.appendScriptData)({
+            scriptDataAppender: args.scriptDataAppender,
             nlpName: "VerifyAlertPopupIsDisplayed",
-            stepInputs: [],
-            elementsData: []
-        }));
+            stepInputs: [value],
+        });
     }
     catch (error) {
         args.scriptDataAppender.setErrorNLP("VerifyAlertPopupIsDisplayed");

package/dist/automation/actions/interaction/alert/verifyTextPresentOnAlertPopup.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifyTextPresentOnAlertPopup = verifyTextPresentOnAlertPopup;
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 async function verifyTextPresentOnAlertPopup(args) {
     try {
         const alertText = await args.driver.getAlertText();
         if (alertText.toLowerCase() === args.value.toLowerCase()) {
-            args.scriptDataAppender.add(async () => ({
+            (0, appendScriptData_js_1.appendScriptData)({
+                scriptDataAppender: args.scriptDataAppender,
                 nlpName: "VerifyTextPresentOnAlertPopup",
                 stepInputs: [args.value],
-                elementsData: []
-            }));
+            });
         }
         else {
             args.scriptDataAppender.setErrorNLP("VerifyTextPresentOnAlertPopup");

package/dist/automation/actions/interaction/alert/waitTillAlertIsPresent.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.waitTillAlertIsPresent = waitTillAlertIsPresent;
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 async function waitTillAlertIsPresent(args) {
     const { timeout = 10000 } = args;
     try {
         await args.driver.waitUntil(async () => await args.driver.isAlertOpen(), { timeout });
-        args.scriptDataAppender.add(async () => ({
-            nlpName: "WaitTillAlertIsPresent",
-            stepInputs: [],
-            elementsData: []
-        }));
+        (0, appendScriptData_js_1.appendScriptData)({
+            scriptDataAppender: args.scriptDataAppender,
+            nlpName: "WaitTillAlertIsPresent"
+        });
     }
     catch (error) {
         args.scriptDataAppender.setErrorNLP("WaitTillAlertIsPresent");

package/dist/automation/actions/interaction/clear/clear.js

@@ -1,45 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clear = clear;
+const enterActionHelper_js_1 = require("../../../../utils/helpers/enterActionHelper.js");
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 async function clear(args) {
+    const nlpName = args.platform === "ios" ? "IOS_Clear" : "MOB_Clear";
     switch (args.platform) {
         case "android":
+        case "ios":
             try {
-                await args.driver.$(args.selector).clearValue();
-                args.scriptDataAppender.add(async () => {
-                    return {
-                        nlpName: 'MOB_Clear',
-                        stepInputs: [],
-                        elementsData: [{
-                                name: args.elementName,
-                                type: args.elementType,
-                                locators: [{ "name": "xpath", "value": args.selector }],
-                                platform: args.platform
-                            }]
-                    };
+                const { ffNumber, xpathPath } = (0, enterActionHelper_js_1.enterActionHelperMob)(args.pageDOM, args.fireflinkIndex);
+                await args.driver.$(xpathPath).clearValue();
+                const ffElementNumber = `Fire-Flink-${ffNumber}`;
+                (0, appendScriptData_js_1.appendScriptData)({
+                    scriptDataAppender: args.scriptDataAppender,
+                    nlpName: nlpName,
+                    stepInputs: [],
+                    pageDOM: args.pageDOM,
+                    elementGetter: args.elementGetter,
+                    ffNumber: ffElementNumber,
+                    elementName: args.elementName,
+                    elementType: args.elementType,
+                    selector: args.selector,
+                    platform: args.platform
                 });
             }
             catch (error) {
-                args.scriptDataAppender.setErrorNLP("MOB_Clear");
+                args.scriptDataAppender.setErrorNLP(nlpName);
                 throw new Error("clear action failed", { cause: error });
             }
             break;
         case "web":
         default:
             try {
-                await args.driver.$(args.selector).clearValue();
-                args.scriptDataAppender.add(async () => {
-                    const ffElement = await args.elementGetter.getFireFlinkElement(args.pageDOM, `[ff-inspect="${args.fireflinkIndex}"]`);
-                    return {
-                        nlpName: 'Clear',
-                        stepInputs: [],
-                        elementsData: [{
-                                name: args.elementName,
-                                type: args.elementType,
-                                locators: ffElement.locators,
-                                platform: args.platform
-                            }]
-                    };
+                const { ffNumber, xpathPath } = (0, enterActionHelper_js_1.enterActionHelper)(args.pageDOM, args.fireflinkIndex);
+                await args.driver.$(xpathPath).clearValue();
+                const ffElementNumber = `Fire-Flink-${ffNumber}`;
+                (0, appendScriptData_js_1.appendScriptData)({
+                    scriptDataAppender: args.scriptDataAppender,
+                    nlpName: 'Clear',
+                    stepInputs: [],
+                    pageDOM: args.pageDOM,
+                    elementGetter: args.elementGetter,
+                    ffNumber: ffElementNumber,
+                    elementName: args.elementName,
+                    elementType: args.elementType,
+                    selector: args.selector,
+                    platform: args.platform
                 });
             }
             catch (error) {

package/dist/automation/actions/interaction/clear/clearAndEnter.js

@@ -1,49 +1,56 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clearAndEnter = clearAndEnter;
+const enterActionHelper_js_1 = require("../../../../utils/helpers/enterActionHelper.js");
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 async function clearAndEnter(args) {
+    const nlpName = args.platform === "ios" ? "IOS_ClearThenEnterInput" : "MOB_ClearThenEnterInput";
     switch (args.platform) {
         case "android":
+        case "ios":
             try {
-                const element = args.driver.$(args.selector);
+                const { ffNumber, xpathPath } = (0, enterActionHelper_js_1.enterActionHelperMob)(args.pageDOM, args.fireflinkIndex);
+                const element = args.driver.$(xpathPath);
                 await element.clearValue();
                 await element.setValue(args.value);
-                args.scriptDataAppender.add(async () => {
-                    return {
-                        nlpName: 'MOB_ClearThenEnterInput',
-                        stepInputs: [args.value],
-                        elementsData: [{
-                                name: args.elementName,
-                                type: args.elementType,
-                                locators: [{ "name": "xpath", "value": args.selector }],
-                                platform: args.platform
-                            }]
-                    };
+                const ffElementNumber = `Fire-Flink-${ffNumber}`;
+                (0, appendScriptData_js_1.appendScriptData)({
+                    scriptDataAppender: args.scriptDataAppender,
+                    nlpName: nlpName,
+                    stepInputs: [],
+                    pageDOM: args.pageDOM,
+                    elementGetter: args.elementGetter,
+                    ffNumber: ffElementNumber,
+                    elementName: args.elementName,
+                    elementType: args.elementType,
+                    selector: args.selector,
+                    platform: args.platform
                 });
             }
             catch (error) {
-                args.scriptDataAppender.setErrorNLP("MOB_ClearThenEnterInput");
+                args.scriptDataAppender.setErrorNLP(nlpName);
                 throw new Error("clear and enter action failed", { cause: error });
             }
             break;
         case "web":
         default:
             try {
-                const element = args.driver.$(args.selector);
+                const { ffNumber, xpathPath } = (0, enterActionHelper_js_1.enterActionHelper)(args.pageDOM, args.fireflinkIndex);
+                const element = args.driver.$(xpathPath);
                 await element.clearValue();
                 await element.setValue(args.value);
-                args.scriptDataAppender.add(async () => {
-                    const ffElement = await args.elementGetter.getFireFlinkElement(args.pageDOM, `[ff-inspect="${args.fireflinkIndex}"]`);
-                    return {
-                        nlpName: 'ClearThenEnterInput',
-                        stepInputs: [args.value],
-                        elementsData: [{
-                                name: args.elementName,
-                                type: args.elementType,
-                                locators: ffElement.locators,
-                                platform: args.platform
-                            }]
-                    };
+                const ffElementNumber = `Fire-Flink-${ffNumber}`;
+                (0, appendScriptData_js_1.appendScriptData)({
+                    scriptDataAppender: args.scriptDataAppender,
+                    nlpName: nlpName,
+                    stepInputs: [],
+                    pageDOM: args.pageDOM,
+                    elementGetter: args.elementGetter,
+                    ffNumber: ffElementNumber,
+                    elementName: args.elementName,
+                    elementType: args.elementType,
+                    selector: args.selector,
+                    platform: args.platform
                 });
             }
             catch (error) {

package/dist/automation/actions/interaction/click/MOB_DoubleTapAtSpecifiedLocation.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MOB_DoubleTapAtSpecifiedLocation = MOB_DoubleTapAtSpecifiedLocation;
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 async function MOB_DoubleTapAtSpecifiedLocation(args) {
     try {
         const input = args.value || "";
@@ -14,12 +15,10 @@ async function MOB_DoubleTapAtSpecifiedLocation(args) {
             x: x,
             y: y
         });
-        args.scriptDataAppender.add(async () => {
-            return {
-                nlpName: 'MOB_DoubleTapAtSpecifiedLocation',
-                elementsData: [],
-                stepInputs: [x, y],
-            };
+        (0, appendScriptData_js_1.appendScriptData)({
+            scriptDataAppender: args.scriptDataAppender,
+            nlpName: 'MOB_DoubleTapAtSpecifiedLocation',
+            stepInputs: [x, y],
         });
     }
     catch (error) {

package/dist/automation/actions/interaction/click/click.js

@@ -1,46 +1,78 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.click = click;
+const logData_js_1 = require("../../../../utils/logger/logData.js");
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 async function click(args) {
+    const nlpName = args.platform === "ios" ? "IOS_Tap" : "MOB_Tap";
     switch (args.platform) {
         case "android":
+        case "ios":
             try {
                 const element = await args.driver.$(args.selector);
                 await element.click();
-                args.scriptDataAppender.add(async () => ({
-                    nlpName: "MOB_Tap",
+                (0, appendScriptData_js_1.appendScriptData)({
+                    scriptDataAppender: args.scriptDataAppender,
+                    nlpName: nlpName,
                     stepInputs: [],
-                    elementsData: [{
-                            name: args.elementName,
-                            type: args.elementType,
-                            locators: [{ "name": "xpath", "value": args.selector }],
-                            platform: args.platform
-                        }]
-                }));
+                    pageDOM: args.pageDOM,
+                    elementGetter: args.elementGetter,
+                    ffNumber: args.fireflinkIndex,
+                    elementName: args.elementName,
+                    elementType: args.elementType,
+                    selector: args.selector,
+                    platform: args.platform
+                });
             }
             catch (error) {
-                args.scriptDataAppender.setErrorNLP("MOB_Tap");
-                throw new Error(`MOB_Tap action failed`, { cause: error });
+                args.scriptDataAppender.setErrorNLP(nlpName);
+                throw new Error(`Tap action failed`, { cause: error });
             }
             break;
         case "web":
         default:
             try {
                 const element = await args.driver.$(args.selector);
-                await element.scrollIntoView({ block: "center", inline: "center" });
-                await element.click();
-                args.scriptDataAppender.add(async () => {
-                    const ffElement = await args.elementGetter.getFireFlinkElement(args.pageDOM, `[ff-inspect="${args.fireflinkIndex}"]`);
-                    return {
-                        nlpName: "Click",
-                        stepInputs: [],
-                        elementsData: [{
-                                name: args.elementName,
-                                type: args.elementType,
-                                locators: ffElement.locators,
-                                platform: args.platform
-                            }]
-                    };
+                let jsClick = false;
+                await args.driver.execute((el) => {
+                    el.scrollIntoView({
+                        block: "center",
+                        inline: "center"
+                    });
+                }, element);
+                try {
+                    await element.click();
+                }
+                catch (clickError) {
+                    try {
+                        logData_js_1.logger.info(`normal click failed : ${String(clickError?.message || clickError).slice(0, 50)}`);
+                        await args.driver.executeScript("arguments[0].click();", [element]);
+                        jsClick = true;
+                    }
+                    catch (jsError) {
+                        try {
+                            logData_js_1.logger.info(`js click failed : ${String(jsError?.message || jsError).slice(0, 50)}`);
+                            await args.driver.execute((el) => {
+                                el.click();
+                            }, element);
+                        }
+                        catch (innerError) {
+                            throw new Error("cause", { cause: innerError });
+                        }
+                    }
+                }
+                const webNlp = jsClick ? "ClickUsingJS" : "Click";
+                (0, appendScriptData_js_1.appendScriptData)({
+                    scriptDataAppender: args.scriptDataAppender,
+                    nlpName: webNlp,
+                    stepInputs: [],
+                    pageDOM: args.pageDOM,
+                    elementGetter: args.elementGetter,
+                    ffNumber: args.fireflinkIndex,
+                    elementName: args.elementName,
+                    elementType: args.elementType,
+                    selector: args.selector,
+                    platform: args.platform
                 });
             }
             catch (error) {

package/dist/automation/actions/interaction/click/clickNtimes.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clickNTimes = clickNTimes;
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 async function clickNTimes(args) {
     switch (args.platform) {
         case "android":
@@ -9,17 +10,17 @@ async function clickNTimes(args) {
                 for (let i = 0; i < Number(args.value); i++) {
                     await element.click();
                 }
-                args.scriptDataAppender.add(async () => {
-                    return {
-                        nlpName: 'MOB_TapNTimes',
-                        stepInputs: [args.value],
-                        elementsData: [{
-                                name: args.elementName,
-                                type: args.elementType,
-                                locators: [{ "name": "xpath", "value": args.selector }],
-                                platform: args.platform
-                            }]
-                    };
+                (0, appendScriptData_js_1.appendScriptData)({
+                    scriptDataAppender: args.scriptDataAppender,
+                    nlpName: 'MOB_TapNTimes',
+                    stepInputs: [args.value],
+                    pageDOM: args.pageDOM,
+                    elementGetter: args.elementGetter,
+                    ffNumber: args.fireflinkIndex,
+                    elementName: args.elementName,
+                    elementType: args.elementType,
+                    selector: args.selector,
+                    platform: args.platform
                 });
             }
             catch (error) {
@@ -31,22 +32,26 @@ async function clickNTimes(args) {
         default:
             try {
                 const element = await args.driver.$(args.selector);
-                await element.scrollIntoView({ block: 'center', inline: 'center' });
+                await args.driver.execute((el) => {
+                    el.scrollIntoView({
+                        block: "center",
+                        inline: "center"
+                    });
+                }, element);
                 for (let i = 0; i < Number(args.value); i++) {
                     await element.click();
                 }
-                args.scriptDataAppender.add(async () => {
-                    const ffElement = await args.elementGetter.getFireFlinkElement(args.pageDOM, `[ff-inspect="${args.fireflinkIndex}"]`);
-                    return {
-                        nlpName: 'ClickNTimes',
-                        stepInputs: [args.value],
-                        elementsData: [{
-                                name: args.elementName,
-                                type: args.elementType,
-                                locators: ffElement.locators,
-                                platform: args.platform
-                            }]
-                    };
+                (0, appendScriptData_js_1.appendScriptData)({
+                    scriptDataAppender: args.scriptDataAppender,
+                    nlpName: 'ClickNTimes',
+                    stepInputs: [args.value],
+                    pageDOM: args.pageDOM,
+                    elementGetter: args.elementGetter,
+                    ffNumber: args.fireflinkIndex,
+                    elementName: args.elementName,
+                    elementType: args.elementType,
+                    selector: args.selector,
+                    platform: args.platform
                 });
             }
             catch (error) {

package/dist/automation/actions/interaction/click/clickUsingJs.js

@@ -1,24 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clickUsingJS = clickUsingJS;
+const appendScriptData_js_1 = require("../../../../fireflinkData/fireflinkScript/appendScriptData.js");
 async function clickUsingJS(args) {
     try {
         const element = await args.driver.$(args.selector);
         await args.driver.execute((el) => {
             el.click();
         }, element);
-        args.scriptDataAppender.add(async () => {
-            const ffElement = await args.elementGetter.getFireFlinkElement(args.pageDOM, `[ff-inspect="${args.fireflinkIndex}"]`);
-            return {
-                nlpName: 'ClickUsingJS',
-                stepInputs: [],
-                elementsData: [{
-                        name: args.elementName,
-                        type: args.elementType,
-                        locators: ffElement.locators,
-                        platform: args.platform
-                    }]
-            };
+        (0, appendScriptData_js_1.appendScriptData)({
+            scriptDataAppender: args.scriptDataAppender,
+            nlpName: 'ClickUsingJS',
+            stepInputs: [],
+            pageDOM: args.pageDOM,
+            elementGetter: args.elementGetter,
+            ffNumber: args.fireflinkIndex,
+            elementName: args.elementName,
+            elementType: args.elementType,
+            selector: args.selector,
+            platform: args.platform
         });
     }
     catch (error) {