@mablhq/mabl-cli 2.0.3 → 2.1.0

package/http/MablHttpAgent.js

@@ -55,14 +55,11 @@ class MablHttpAgent extends agent_base_1.Agent {
             httpsAgent: (_b = httpsAgent !== null && httpsAgent !== void 0 ? httpsAgent : proxyConfig.httpsAgent) !== null && _b !== void 0 ? _b : https.globalAgent,
         };
     }
-    createSocket(req, options, cb) {
+    callback(req, opts) {
         var _a;
         if ((_a = this.maybeGetFirstStringHeader(req, httpUtil_1.USER_AGENT_HEADER)) === null || _a === void 0 ? void 0 : _a.startsWith('PostmanRuntime/')) {
             req.setHeader(httpUtil_1.USER_AGENT_HEADER, httpUtil_1.USER_AGENT);
         }
-        super.createSocket(req, options, cb);
-    }
-    connect(_req, opts) {
         return Promise.resolve(opts.secureEndpoint ? this.httpsAgent : this.httpAgent);
     }
     maybeGetFirstStringHeader(req, name) {

package/http/RequestFilteringHttpAgent.js

@@ -45,17 +45,17 @@ class RequestFilteringHttpAgent extends MablHttpAgent_1.MablHttpAgent {
         const constructorParameters = await MablHttpAgent_1.MablHttpAgent.getConstructorParameters();
         return new RequestFilteringHttpAgent(constructorParameters.httpAgent, constructorParameters.httpsAgent);
     }
-    connect(req, opts) {
+    callback(req, opts) {
         if (isForbiddenHost(opts.host)) {
             return Promise.reject(new RequestSecurityError_1.RequestSecurityError('Request contains forbidden host'));
         }
-        else if (containsForbiddenHeader(req.getHeaders())) {
+        else if (containsForbiddenHeader(opts.headers)) {
             return Promise.reject(new RequestSecurityError_1.RequestSecurityError('Request contains forbidden header'));
         }
         else if (isPrivateAddress(opts.host)) {
             return Promise.reject(new RequestSecurityError_1.RequestSecurityError('Request contains private address'));
         }
-        return super.connect(req, opts);
+        return super.callback(req, opts);
     }
 }
 exports.RequestFilteringHttpAgent = RequestFilteringHttpAgent;

package/http/axiosProxyConfig.js

@@ -59,8 +59,7 @@ function axiosProxyConfig(httpConfig) {
     if (testExecutionProxyUrl || ((_a = httpConfig.proxyHost) === null || _a === void 0 ? void 0 : _a.href)) {
         config.proxy = proxyUrlToPortConfig((testExecutionProxyUrl !== null && testExecutionProxyUrl !== void 0 ? testExecutionProxyUrl : httpConfig.proxyHost));
     }
-    const result = maybeGetModifiedAxiosConfigForHttpProxy(config, sslVerify, proxyType);
-    return result;
+    return maybeGetModifiedAxiosConfigForHttpProxy(config, sslVerify, proxyType);
 }
 exports.axiosProxyConfig = axiosProxyConfig;
 function escapeRegexDots(input) {
@@ -103,9 +102,13 @@ function maybeGetModifiedAxiosConfigForHttpProxy(config, sslVerify, proxyType) {
             proxyString += `${authConfig.username}:${authConfig.password}@`;
         }
         proxyString += `${config.proxy.host}:${config.proxy.port}`;
-        const proxyUrl = new URL(proxyString);
         const configOptions = {
-            rejectUnauthorized: sslVerify !== false,
+            host: config.proxy.host,
+            port: config.proxy.port,
+            auth: authConfig
+                ? `${authConfig.username}:${authConfig.password}`
+                : undefined,
+            rejectUnauthorized: sslVerify === true,
         };
         if (proxyType === 'current') {
             const agentConfig = {
@@ -114,14 +117,14 @@ function maybeGetModifiedAxiosConfigForHttpProxy(config, sslVerify, proxyType) {
                 maxSockets: 256,
                 maxFreeSockets: 256,
                 proxy: proxyString,
-                rejectUnauthorized: sslVerify !== false,
+                rejectUnauthorized: sslVerify === true,
             };
             newConfig.httpsAgent = new hpagent_1.HttpsProxyAgent(agentConfig);
         }
         else {
-            newConfig.httpsAgent = new https_proxy_agent_1.HttpsProxyAgent(proxyUrl, configOptions);
+            newConfig.httpsAgent = new https_proxy_agent_1.HttpsProxyAgent(configOptions);
         }
-        newConfig.httpAgent = new https_proxy_agent_1.HttpsProxyAgent(proxyUrl, configOptions);
+        newConfig.httpAgent = new https_proxy_agent_1.HttpsProxyAgent(configOptions);
         return newConfig;
     }
     return config;

package/http/httpUtil.js

@@ -27,12 +27,16 @@ function maybeGetSocksAgent(linkServer) {
     if (!linkServer) {
         return;
     }
-    const user = linkServer.workspace_id;
-    const password = linkServer.label;
-    const host = linkServer.forwarding_host;
-    const port = linkServer.forwarding_port;
-    const url = new URL(`socks5h://${user}:${password}@${host}:${port}`);
-    return new socks_proxy_agent_1.SocksProxyAgent(url);
+    const agentOptions = {
+        host: linkServer.forwarding_host,
+        port: linkServer.forwarding_port,
+        userId: linkServer.workspace_id,
+        password: linkServer.label,
+        tls: {
+            rejectUnauthorized: false,
+        },
+    };
+    return new socks_proxy_agent_1.SocksProxyAgent(agentOptions);
 }
 function postProcessHeaders(response) {
     var _a, _b, _c;

package/index.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRunnerVersion = exports.createRunConfig = exports.createMablTestRunner = exports.editTest = exports.trainNewTest = void 0;
+exports.getRunnerVersion = exports.createRunConfig = exports.MobileTestsRunner = exports.BrowserTestsRunner = exports.editTest = exports.trainNewTest = void 0;
 var trainingSessions_1 = require("./core/trainer/trainingSessions");
 Object.defineProperty(exports, "trainNewTest", { enumerable: true, get: function () { return trainingSessions_1.trainNewTest; } });
 Object.defineProperty(exports, "editTest", { enumerable: true, get: function () { return trainingSessions_1.editTest; } });
 var index_1 = require("./execution/index");
-Object.defineProperty(exports, "createMablTestRunner", { enumerable: true, get: function () { return index_1.createTestRunner; } });
+Object.defineProperty(exports, "BrowserTestsRunner", { enumerable: true, get: function () { return index_1.BrowserTestsRunner; } });
+Object.defineProperty(exports, "MobileTestsRunner", { enumerable: true, get: function () { return index_1.MobileTestsRunner; } });
 Object.defineProperty(exports, "createRunConfig", { enumerable: true, get: function () { return index_1.createRunConfig; } });
 Object.defineProperty(exports, "getRunnerVersion", { enumerable: true, get: function () { return index_1.getRunnerVersion; } });

package/mablscript/MablAction.js

@@ -4,9 +4,10 @@ exports.convertObjectToMablscriptArgs = exports.distinctStrings = exports.parseA
 const domUtil_1 = require("../domUtil");
 const MablSymbol_1 = require("./MablSymbol");
 class MablAction {
-    constructor(name, args) {
+    constructor(name, actionCode, args) {
         this.name = name;
         this.args = args;
+        this.actionCode = actionCode;
     }
     getActionArgs() {
         return this.args ? this.args : [];
@@ -17,6 +18,9 @@ class MablAction {
     getActionSourceIndexInStep() {
         return this.actionSourceIndexInStep;
     }
+    getActionCode() {
+        return this.actionCode;
+    }
     subVariable(argument) {
         if (argumentIsMablVariable(argument)) {
             const matches = argument.match(MablSymbol_1.SINGLE_VARIABLE_PATTERN_REGEX);

package/mablscript/MablStep.js

@@ -9,14 +9,20 @@ const MablAction_1 = require("./MablAction");
 const MablSymbol_1 = require("./MablSymbol");
 const fast_json_stable_stringify_1 = __importDefault(require("fast-json-stable-stringify"));
 class MablStep extends MablAction_1.MablAction {
-    constructor(name, args, actions) {
-        super(name, args);
+    constructor(name, args, actions, actionCode) {
+        super(name, actionCode, args);
         this.stepVersion = 1;
         this.actions = actions;
     }
     getStepVersion() {
         return this.stepVersion;
     }
+    setStepId(id) {
+        this.id = id;
+    }
+    stepId() {
+        return this.id;
+    }
     canContinueOnFailure() {
         return false;
     }
@@ -94,7 +100,11 @@ class MablStep extends MablAction_1.MablAction {
         const formatted = {};
         formatted[this.getStepName()] =
             this.annotationsAsYml();
-        Object.assign(formatted[this.getStepName()], this.toStepDescriptor(fullLocatorsOn));
+        const { actionCode, ...stepDescriptor } = this.toStepDescriptor(fullLocatorsOn);
+        Object.assign(formatted[this.getStepName()], stepDescriptor);
+        if (this.stepId()) {
+            formatted[this.getStepName()].id = this.stepId();
+        }
         return formatted;
     }
     toMablscript() {

package/mablscript/MablStepV2.js

@@ -3,13 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isMablStepV2 = exports.MablStepV2 = void 0;
 const MablStep_1 = require("./MablStep");
 class MablStepV2 extends MablStep_1.MablStep {
-    constructor(name, descriptor) {
-        super(name, [], []);
+    constructor(name, descriptor, actionCode) {
+        super(name, [], [], actionCode);
         this.stepVersion = 2;
         this.descriptor = descriptor;
     }
-    static fromYaml(stepName, stepDescriptor) {
-        return new MablStepV2(stepName, stepDescriptor);
+    stepId() {
+        return this.descriptor.id;
+    }
+    setStepId(id) {
+        this.descriptor.id = id;
+    }
+    static fromYaml(stepName, stepDescriptor, actionCode) {
+        return new MablStepV2(stepName, stepDescriptor, actionCode);
     }
     getStepName() {
         return this.name;

package/mablscript/actions/AwaitDownloadAction.js

@@ -4,7 +4,7 @@ exports.AwaitDownloadAction = void 0;
 const MablAction_1 = require("../MablAction");
 class AwaitDownloadAction extends MablAction_1.MablAction {
     constructor(name, args) {
-        super(name, args);
+        super(name, 'await_download', args);
     }
     toMablscript() {
         return 'await_download()';

package/mablscript/actions/ConditionAction.js

@@ -6,7 +6,7 @@ const MablAction_1 = require("../MablAction");
 const ConditionDescriptor_1 = require("../types/ConditionDescriptor");
 class ConditionAction extends MablAction_1.MablAction {
     constructor(name, args) {
-        super(name, args);
+        super(name, name, args);
         this.conditionAttribute = '';
         this.conditionValueAttribute = '';
         this.setConditionAttributes();

package/mablscript/actions/CountAction.js

@@ -4,7 +4,7 @@ exports.CountAction = void 0;
 const MablAction_1 = require("../MablAction");
 class CountAction extends MablAction_1.MablAction {
     constructor(name, args) {
-        super(name, args);
+        super(name, 'count', args);
         this.countDescriptor = { count: true };
     }
     toMablscript() {

package/mablscript/actions/ExtractAction.js

@@ -13,7 +13,7 @@ var ExtractTypeName;
 })(ExtractTypeName = exports.ExtractTypeName || (exports.ExtractTypeName = {}));
 class ExtractAction extends MablAction_1.MablAction {
     constructor(name, args) {
-        super(name, args);
+        super(name, name, args);
         if (this.name === ExtractDescriptor_1.ExtractType.EXTRACT_INNER_TEXT) {
             this.name = ExtractDescriptor_1.ExtractType.EXTRACT_ATTRIBUTE;
             this.extractionAttribute = 'innerText';

package/mablscript/actions/FindAction.js

@@ -18,7 +18,7 @@ exports.formattedFindTypeToMablscript = {};
 Object.entries(exports.findTypesToFormattedType).forEach(([findType, field]) => (exports.formattedFindTypeToMablscript[field] = findType));
 class FindAction extends MablAction_1.MablAction {
     constructor(name, args) {
-        super(name, args);
+        super(name, name, args);
         const actionName = this.getActionName();
         if (!(0, domUtil_1.isFindType)(actionName)) {
             throw new Error(`Unknown find type for action: ${actionName}`);

package/mablscript/actions/GenerateEmailAddressAction.js

@@ -4,7 +4,7 @@ exports.GenerateEmailAddressAction = void 0;
 const MablAction_1 = require("../MablAction");
 class GenerateEmailAddressAction extends MablAction_1.MablAction {
     constructor(name, args) {
-        super(name, args);
+        super(name, 'generate_email_address', args);
     }
     toMablscript() {
         return 'generate_email_address()';

package/mablscript/actions/GenerateRandomStringAction.js

@@ -5,7 +5,7 @@ const MablAction_1 = require("../MablAction");
 const domUtil_1 = require("../../domUtil");
 class GenerateRandomStringAction extends MablAction_1.MablAction {
     constructor(name, args) {
-        super(name, args);
+        super(name, 'generate_random_string', args);
         this.generateString = this.getActionArgs()[0];
     }
     toMablscript() {

package/mablscript/actions/GetUrlAction.js

@@ -5,7 +5,7 @@ const MablAction_1 = require("../MablAction");
 const GetCurrentLocationDescriptor_1 = require("../types/GetCurrentLocationDescriptor");
 class GetUrlAction extends MablAction_1.MablAction {
     constructor(name, args) {
-        super(name, args);
+        super(name, 'get_current_location', args);
     }
     toMablscript() {
         return `get_current_location()`;

package/mablscript/actions/GetVariableValue.js

@@ -6,7 +6,7 @@ const MablSymbol_1 = require("../MablSymbol");
 const GetVariableDescriptor_1 = require("../types/GetVariableDescriptor");
 class GetVariableValue extends MablAction_1.MablAction {
     constructor(name, args) {
-        super(name, args);
+        super(name, 'get_variable_value', args);
         const arg = this.getActionArgs()[0];
         if (typeof arg !== 'string') {
             throw new Error('Expected string argument');

package/mablscript/actions/JavaScriptAction.js

@@ -23,7 +23,7 @@ function isSnippetOptions(value) {
 }
 class JavaScriptAction extends MablAction_1.MablAction {
     constructor(name, args) {
-        super(name, args);
+        super(name, MABLSCRIPT_NAME, args);
         if (args.length < 1 || args.length > 2) {
             throw new Error('EvaluateJS action expects 1 or 2 arguments');
         }
@@ -36,12 +36,14 @@ class JavaScriptAction extends MablAction_1.MablAction {
         if (typeof scriptOrSnippetReference === 'string') {
             this.javaScript = {
                 encodedJS: scriptOrSnippetReference,
+                actionCode: MABLSCRIPT_NAME,
             };
         }
         else if (isLegacySnippetReference(scriptOrSnippetReference)) {
             const { id } = scriptOrSnippetReference;
             this.javaScript = {
                 snippetInvariantId: id,
+                actionCode: MABLSCRIPT_NAME,
             };
         }
         else if (isReusableSnippetReference(scriptOrSnippetReference)) {
@@ -50,6 +52,7 @@ class JavaScriptAction extends MablAction_1.MablAction {
                 snippetId: id,
                 snippetInvariantId: invariant_id,
                 parameterOverrides: [],
+                actionCode: MABLSCRIPT_NAME,
             };
             const snippetOptions = args[1];
             if (isSnippetOptions(snippetOptions)) {
@@ -60,6 +63,7 @@ class JavaScriptAction extends MablAction_1.MablAction {
             this.javaScript = {
                 inlineSnippet: scriptOrSnippetReference,
                 parameterOverrides: [],
+                actionCode: MABLSCRIPT_NAME,
             };
             const snippetOptions = args[1];
             if (isSnippetOptions(snippetOptions)) {
@@ -71,7 +75,7 @@ class JavaScriptAction extends MablAction_1.MablAction {
         }
     }
     toDescriptor() {
-        return { javaScript: this.javaScript };
+        return { javaScript: this.javaScript, actionCode: this.actionCode };
     }
     static fromDescriptor(descriptor) {
         const { javaScript } = descriptor;

package/mablscript/importer.js

@@ -171,13 +171,13 @@ function loadMablScriptIntoSteps(parsedMablscript) {
             const actionType = rawMablscriptToObjectsActionsMap[parsedAction.name];
             const action = actionType
                 ? new actionType(parsedAction.name, parsedAction.arguments)
-                : new MablAction_1.MablAction(parsedAction.name, parsedAction.arguments);
+                : new MablAction_1.MablAction(parsedAction.name, parsedAction.name, parsedAction.arguments);
             action.setActionSourceIndexInStep(actionIndex);
             return action;
         });
         let step = stepType
             ? new stepType(lastAction.name, lastAction.arguments, actions)
-            : new MablStep_1.MablStep(lastAction.name, lastAction.arguments, actions);
+            : new MablStep_1.MablStep(lastAction.name, lastAction.arguments, actions, lastAction.name);
         if (step instanceof AssertStepOld_1.AssertStepOld) {
             step = step.getNewAssertionStep();
         }
@@ -234,7 +234,7 @@ function stepFromObjectInfo(stepName, stepArgs, isMobile) {
     if (Object.keys(yamlMablscriptToObjectsStepV1Map).includes(stepName)) {
         return yamlMablscriptToObjectsStepV1Map[stepName](stepName, stepArgs);
     }
-    return new MablStep_1.MablStep(stepName, [], []);
+    return new MablStep_1.MablStep(stepName, [], [], stepName);
 }
 function getMablscriptMaybeWithComment(step) {
     return `${step.isDisabled() ? '//' : ''}${step.toMablscript()}`;

package/mablscript/mobile/steps/CreateVariableMobileStep.js

@@ -8,7 +8,7 @@ const MobileFindAction_1 = require("./actions/MobileFindAction");
 const stepUtil_1 = require("./stepUtil");
 class CreateVariableMobileStep extends MablStepV2_1.MablStepV2 {
     constructor(descriptor) {
-        super(CreateVariableMobileStep.stepName, descriptor);
+        super(CreateVariableMobileStep.stepName, descriptor, 'mablscript_as');
         if ((0, CreateVariableMobileStepDescriptor_1.isCreateVariableMobileFindStepDescriptor)(this.descriptor)) {
             this.findAction = MobileFindAction_1.MobileFindAction.fromDescriptor(this.descriptor.find);
             this.actions = [this.findAction];

package/mablscript/mobile/steps/EnterTextStep.js

@@ -8,7 +8,7 @@ const MablAction_1 = require("../../MablAction");
 const STEP_NAME = 'EnterText';
 class EnterTextStep extends MablStepV2_1.MablStepV2 {
     constructor(descriptor) {
-        super(EnterTextStep.stepName, descriptor);
+        super(EnterTextStep.stepName, descriptor, 'enter_text');
     }
     getInputVariables() {
         const { find, text } = this.descriptor;
@@ -17,7 +17,7 @@ class EnterTextStep extends MablStepV2_1.MablStepV2 {
         return vars;
     }
     stepDescription() {
-        return (0, stepUtil_1.getDescriptionForMobileStep)(`Enter text "${this.descriptor.text}" in`, this.descriptor);
+        return (0, stepUtil_1.getDescriptionForMobileStepDescriptor)(`Enter text "${this.descriptor.text}" in`, this.descriptor);
     }
     static fromYaml(_stepName, stepDescriptor) {
         if (!stepDescriptor.find &&

package/mablscript/mobile/steps/NavigateBackStep.js

@@ -5,7 +5,7 @@ const MablStepV2_1 = require("../../MablStepV2");
 const STEP_NAME = 'NavigateBack';
 class NavigateBackStep extends MablStepV2_1.MablStepV2 {
     constructor(descriptor) {
-        super(NavigateBackStep.stepName, descriptor);
+        super(NavigateBackStep.stepName, descriptor, 'navigate_back');
     }
     stepDescription() {
         return `Navigate back`;

package/mablscript/mobile/steps/NavigateHomeStep.js

@@ -5,7 +5,7 @@ const MablStepV2_1 = require("../../MablStepV2");
 const STEP_NAME = 'NavigateHome';
 class NavigateHomeStep extends MablStepV2_1.MablStepV2 {
     constructor(descriptor) {
-        super(NavigateHomeStep.stepName, descriptor);
+        super(NavigateHomeStep.stepName, descriptor, 'navigate_home');
         this.descriptor = descriptor;
     }
     stepDescription() {

package/mablscript/mobile/steps/ScrollStep.js

@@ -5,7 +5,7 @@ const MablStepV2_1 = require("../../MablStepV2");
 const STEP_NAME = 'Scroll';
 class ScrollStep extends MablStepV2_1.MablStepV2 {
     constructor(descriptor) {
-        super(ScrollStep.stepName, descriptor);
+        super(ScrollStep.stepName, descriptor, 'scroll');
     }
     stepDescription() {
         return humanizeScrollInformation(this.descriptor.coordinates);

package/mablscript/mobile/steps/SetOrientationStep.js

@@ -5,7 +5,7 @@ const MablStepV2_1 = require("../../MablStepV2");
 const STEP_NAME = 'SetOrientation';
 class SetOrientationStep extends MablStepV2_1.MablStepV2 {
     constructor(descriptor) {
-        super(SetOrientationStep.stepName, descriptor);
+        super(SetOrientationStep.stepName, descriptor, 'set_orientation');
     }
     stepDescription() {
         return `Set orientation of device to ${this.descriptor.orientation.toLowerCase()}`;

package/mablscript/mobile/steps/TapStep.js

@@ -8,7 +8,7 @@ const stepUtil_1 = require("./stepUtil");
 const MablAction_1 = require("../../MablAction");
 class TapStep extends MablStepV2_1.MablStepV2 {
     constructor(descriptor) {
-        super(TapStep.stepName, descriptor);
+        super(TapStep.stepName, descriptor, 'tap');
         this.findAction = MobileFindAction_1.MobileFindAction.fromDescriptor(this.descriptor.find);
         this.actions = [this.findAction];
     }
@@ -25,7 +25,7 @@ class TapStep extends MablStepV2_1.MablStepV2 {
             default:
                 prependedText = `Tap on`;
         }
-        return (0, stepUtil_1.getDescriptionForMobileStep)(prependedText, this.descriptor);
+        return (0, stepUtil_1.getDescriptionForMobileStepDescriptor)(prependedText, this.descriptor);
     }
     static fromYaml(_stepName, stepDescriptor) {
         return new TapStep(stepDescriptor);

package/mablscript/mobile/steps/actions/MobileFindAction.js

@@ -4,7 +4,7 @@ exports.MobileFindAction = void 0;
 const MablAction_1 = require("../../../MablAction");
 class MobileFindAction extends MablAction_1.MablAction {
     constructor(findDescriptor) {
-        super('MobileFindAction', [[]]);
+        super('MobileFindAction', 'mobile_find_action', [[]]);
         this.findDescriptor = findDescriptor;
     }
     toDescriptor() {

package/mablscript/mobile/steps/stepUtil.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isStepWithFind = exports.humanizeCustomFind = exports.getDescriptionForMobileStep = exports.getSimpleIOSElementName = exports.getSimpleAndroidElementName = void 0;
+exports.isStepWithFind = exports.humanizeCustomFind = exports.getElementDescriptionFromMobileFindDescriptor = exports.getDescriptionForMobileStepDescriptor = exports.getSimpleIOSElementName = exports.getSimpleAndroidElementName = void 0;
 const domUtil_1 = require("../../../domUtil");
 const mablscriptFind_1 = require("../../../mablscriptFind");
 function getSimpleAndroidElementName(className) {
@@ -22,39 +22,42 @@ function getSimpleIOSElementName(elementName) {
     return 'unknown';
 }
 exports.getSimpleIOSElementName = getSimpleIOSElementName;
-function getDescriptionForMobileStep(predicateAction, descriptor) {
-    var _a;
-    const findTarget = (_a = descriptor.find) === null || _a === void 0 ? void 0 : _a.findTarget;
+function getDescriptionForMobileStepDescriptor(predicateAction, descriptor) {
+    const elementDescription = getElementDescriptionFromMobileFindDescriptor(descriptor.find);
+    return `${predicateAction} ${elementDescription}`;
+}
+exports.getDescriptionForMobileStepDescriptor = getDescriptionForMobileStepDescriptor;
+function getElementDescriptionFromMobileFindDescriptor(descriptor) {
+    const findTarget = descriptor === null || descriptor === void 0 ? void 0 : descriptor.findTarget;
     if ((0, domUtil_1.isMobileFindSpecification)(findTarget)) {
-        if ((0, domUtil_1.isWebViewFindElementDescriptor)(descriptor.find)) {
-            return getDescriptionForWebViewStep(predicateAction, descriptor.find);
+        if ((0, domUtil_1.isWebViewFindElementDescriptor)(descriptor)) {
+            return getDescriptionForWebViewFindDescriptor(descriptor);
         }
         const selector = findTarget.selector;
         if (selector.android && Object.keys(selector.android).length) {
             if (selector.android.text) {
-                return `${predicateAction} element with text "${selector.android.text}"`;
+                return `element with text "${selector.android.text}"`;
             }
-            return `${predicateAction} "${getSimpleAndroidElementName(selector.android.class)}" element`;
+            return `"${getSimpleAndroidElementName(selector.android.class)}" element`;
         }
         else if (selector.iOS) {
             if (selector.iOS.name) {
-                return `${predicateAction} "${selector.iOS.name}" element`;
+                return `"${selector.iOS.name}" element`;
             }
             if (selector.iOS.label) {
-                return `${predicateAction} element with text "${selector.iOS.label}"`;
+                return `element with text "${selector.iOS.label}"`;
             }
-            return `${predicateAction} the "${getSimpleIOSElementName(selector.iOS.type)}" element`;
+            return `the "${getSimpleIOSElementName(selector.iOS.type)}" element`;
         }
     }
-    return `${predicateAction} unknown element`;
+    return 'unknown element';
 }
-exports.getDescriptionForMobileStep = getDescriptionForMobileStep;
-function getDescriptionForWebViewStep(predicateAction, webViewElementDescriptor) {
+exports.getElementDescriptionFromMobileFindDescriptor = getElementDescriptionFromMobileFindDescriptor;
+function getDescriptionForWebViewFindDescriptor(webViewElementDescriptor) {
     if ((0, domUtil_1.isFindElementDescriptor)(webViewElementDescriptor.webView.descriptor)) {
-        const elementDescription = (0, mablscriptFind_1.humanizeFindOneDescriptor)(webViewElementDescriptor.webView.descriptor.findTarget);
-        return `${predicateAction} ${elementDescription}`;
+        return (0, mablscriptFind_1.humanizeFindOneDescriptor)(webViewElementDescriptor.webView.descriptor.findTarget);
     }
-    return `Unknown webview descriptor type.`;
+    return `unknown webview element`;
 }
 function humanizeCustomFind(descriptor) {
     if (isStepWithFind(descriptor)) {

package/mablscript/mobile/tests/steps/CreateVariableMobileStep.mobiletest.js

@@ -7,10 +7,12 @@ const StepTestsUtil_1 = require("../StepTestsUtil");
 describe('CreateVariable mobile steps parse correctly', () => {
     it('Parses a CreateVariable mobile step with variable pattern', () => {
         const stepDescriptor = {
+            id: 'VariableSchmariable',
             generator: {
                 pattern: `my value: {{digit:3}}`,
                 type: CreateVariableStepDescriptor_1.VariableGenerator.PATTERN,
             },
+            actionCode: 'mablscript_as',
             name: 'myValue',
         };
         const steps = [
@@ -19,6 +21,8 @@ describe('CreateVariable mobile steps parse correctly', () => {
             },
         ];
         (0, StepTestsUtil_1.parseAndValidateYamlConversion)(steps, CreateVariableMobileStep_1.CreateVariableMobileStep.stepName, stepDescriptor);
+        const varStep = new CreateVariableMobileStep_1.CreateVariableMobileStep(stepDescriptor);
+        expect(varStep.stepId()).toEqual(stepDescriptor.id);
     });
     it('Parses a CreateVariable mobile step for generating email address', () => {
         const stepDescriptor = {
@@ -26,6 +30,7 @@ describe('CreateVariable mobile steps parse correctly', () => {
                 type: CreateVariableStepDescriptor_1.VariableGenerator.EMAIL,
             },
             name: 'email',
+            actionCode: 'mablscript_as',
         };
         const steps = [
             {
@@ -52,6 +57,7 @@ describe('CreateVariable mobile steps parse correctly', () => {
                 type: CreateVariableStepDescriptor_1.VariableGenerator.ATTRIBUTE,
             },
             name: 'profile',
+            actionCode: 'mablscript_as',
         };
         const steps = [
             {
@@ -78,6 +84,7 @@ describe('CreateVariable mobile steps parse correctly', () => {
                 type: CreateVariableStepDescriptor_1.VariableGenerator.ATTRIBUTE,
             },
             name: 'profile',
+            actionCode: 'mablscript_as',
         };
         const steps = [
             {
@@ -107,6 +114,7 @@ describe('CreateVariable mobile steps parse correctly', () => {
                 type: CreateVariableStepDescriptor_1.VariableGenerator.ELEMENT_COUNT,
             },
             name: 'count',
+            actionCode: 'mablscript_as',
         };
         const steps = [
             {
@@ -136,6 +144,7 @@ describe('CreateVariable mobile steps parse correctly', () => {
                 type: CreateVariableStepDescriptor_1.VariableGenerator.ELEMENT_COUNT,
             },
             name: 'count',
+            actionCode: 'mablscript_as',
         };
         const steps = [
             {
@@ -147,9 +156,10 @@ describe('CreateVariable mobile steps parse correctly', () => {
     it('Parses a CreateVariable mobile step for JavaScript snippet (Android)', () => {
         const stepDescriptor = {
             generator: {
-                javaScript: { encodedJS: 'myScript' },
+                javaScript: { encodedJS: 'myScript', actionCode: 'evaluate_js' },
                 type: CreateVariableStepDescriptor_1.VariableGenerator.JAVASCRIPT,
             },
+            actionCode: 'mablscript_as',
             name: 'result',
         };
         const steps = [
@@ -162,10 +172,11 @@ describe('CreateVariable mobile steps parse correctly', () => {
     it('Parses a CreateVariable mobile step for element count (iOS)', () => {
         const stepDescriptor = {
             generator: {
-                javaScript: { encodedJS: 'myScript' },
+                javaScript: { encodedJS: 'myScript', actionCode: 'evaluate_js' },
                 type: CreateVariableStepDescriptor_1.VariableGenerator.JAVASCRIPT,
             },
             name: 'result',
+            actionCode: 'mablscript_as',
         };
         const steps = [
             {