@mablhq/mabl-cli 1.50.5 → 1.52.2

package/mablscript/MablStep.js

@@ -16,6 +16,9 @@ class MablStep extends MablAction_1.MablAction {
     canContinueOnFailure() {
         return false;
     }
+    canFailAtEnd() {
+        return false;
+    }
     getStepName() {
         return 'UnimplementedStep';
     }

package/mablscript/actions/FindAction.js

@@ -51,20 +51,17 @@ class FindAction extends MablAction_1.MablAction {
             case domUtil_1.FindType.FIND_LAST:
             case domUtil_1.FindType.FIND_ANY:
             case domUtil_1.FindType.FIND_ALL: {
-                const [primarySelector, foundSelector, findOptions] = this.getActionArgs();
+                const [primarySelector, foundElementSelectors, findOptions] = this.getActionArgs();
                 if (!(0, domUtil_1.isCssSelector)(primarySelector) &&
                     !(0, domUtil_1.isXPathSelector)(primarySelector)) {
                     this.isValid = false;
                 }
                 this.findDescriptor = {
-                    findType,
+                    findOptions,
                     findTarget: primarySelector,
-                    foundElementSelectors: foundSelector,
-                    primarySelectors: {
-                        ...primarySelector,
-                        uuid: primarySelector.uuid,
-                    },
-                    hints: findOptions === null || findOptions === void 0 ? void 0 : findOptions.hints,
+                    findType,
+                    foundElementSelectors,
+                    primarySelectors: primarySelector,
                 };
                 break;
             }
@@ -196,10 +193,10 @@ class FindAction extends MablAction_1.MablAction {
                 else {
                     foundElementSelectors = '{selector_type: "element"}';
                 }
-                args = [selector, foundElementSelectors].join(', ');
-                if (find.hints) {
-                    args += `, ${(0, mablscriptFind_1.buildFindHintsString)(find.hints)}`;
-                }
+                const options = buildFindOptionsString(find.findOptions);
+                args = [selector, foundElementSelectors, options]
+                    .filter(Boolean)
+                    .join(', ');
                 if (find.findType === domUtil_1.FindType.FIND_ANY) {
                     action = domUtil_1.FindType.FIND_FIRST;
                 }
@@ -250,7 +247,7 @@ FindAction.yamlMablScriptNames = [
 ];
 function buildFindOptionsString(findOptions) {
     if (!findOptions) {
-        return '';
+        return undefined;
     }
     return JSON.stringify(findOptions);
 }

package/mablscript/steps/AssertStep.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AssertStep = exports.fieldToAssertionStep = exports.assertionStepToField = void 0;
+exports.AssertStep = exports.fieldToAssertionStep = exports.assertionStepToField = exports.OnFailure = void 0;
 const ConditionAction_1 = require("../actions/ConditionAction");
 const FindAction_1 = require("../actions/FindAction");
 const MablStep_1 = require("../MablStep");
@@ -12,6 +12,12 @@ const GetCurrentLocationDescriptor_1 = require("../types/GetCurrentLocationDescr
 const GetVariableValue_1 = require("../actions/GetVariableValue");
 const GetVariableDescriptor_1 = require("../types/GetVariableDescriptor");
 const CountAction_1 = require("../actions/CountAction");
+var OnFailure;
+(function (OnFailure) {
+    OnFailure["ContinueWithWarning"] = "continue";
+    OnFailure["FailImmediately"] = "terminate";
+    OnFailure["FailTestAtEnd"] = "failAtEnd";
+})(OnFailure = exports.OnFailure || (exports.OnFailure = {}));
 exports.assertionStepToField = {
     AssertEquals: 'equals',
     AssertPresent: 'present',
@@ -67,9 +73,17 @@ class AssertStep extends MablStep_1.MablStep {
             args[0] && typeof args[0] === 'object'
                 ? args[0]
                 : undefined;
-        this.continueOnFailure = ((_a = this.assertArguments) === null || _a === void 0 ? void 0 : _a.onFailure) === 'continue';
+        this.onFailure =
+            ((_a = this.assertArguments) === null || _a === void 0 ? void 0 : _a.onFailure) ||
+                OnFailure.FailImmediately;
         this.observationScope = (_b = this.assertArguments) === null || _b === void 0 ? void 0 : _b.observationScope;
     }
+    canContinueOnFailure() {
+        return this.onFailure !== OnFailure.FailImmediately;
+    }
+    canFailAtEnd() {
+        return this.onFailure === OnFailure.FailTestAtEnd;
+    }
     validate() {
         if (!(this.actions.length === 2 || this.actions.length === 3) &&
             !(this.actions[0] instanceof FindAction_1.FindAction) &&
@@ -110,7 +124,7 @@ class AssertStep extends MablStep_1.MablStep {
             extractDescriptor: (_a = this.extractAction) === null || _a === void 0 ? void 0 : _a.extractDescriptor,
             conditionDescriptor: this.conditionAction.conditionDescriptor,
             countDescriptor: (_b = this.countAction) === null || _b === void 0 ? void 0 : _b.countDescriptor,
-            continueOnFailure: this.continueOnFailure,
+            onFailure: this.onFailure,
             observationScope: this.observationScope,
             descriptorToActionMap,
         };
@@ -199,16 +213,21 @@ class AssertStep extends MablStep_1.MablStep {
         }
         return new AssertStep('assert', [
             {
-                onFailure: stepArgs.continueOnFailure ? 'continue' : undefined,
+                onFailure: stepArgs.onFailure,
                 observationScope: stepArgs.observationScope,
             },
         ], actions);
     }
     toMablscript() {
-        var _a, _b;
+        var _a, _b, _c, _d;
         const assertAction = `.assert(${!!(((_a = this.assertArguments) === null || _a === void 0 ? void 0 : _a.onFailure) ||
             ((_b = this.assertArguments) === null || _b === void 0 ? void 0 : _b.observationScope))
-            ? (0, MablAction_1.convertObjectToMablscriptArgs)(this.assertArguments)
+            ? (0, MablAction_1.convertObjectToMablscriptArgs)({
+                ...this.assertArguments,
+                onFailure: ((_c = this.assertArguments) === null || _c === void 0 ? void 0 : _c.onFailure) === OnFailure.FailImmediately
+                    ? undefined
+                    : (_d = this.assertArguments) === null || _d === void 0 ? void 0 : _d.onFailure,
+            })
             : ''})`;
         if (this.countAction) {
             return `${this.primaryAction.toMablscript()}.${this.countAction.toMablscript()}.${this.conditionAction.toMablscript()}${assertAction}`;

package/mablscript/steps/AssertStepOld.js

@@ -36,11 +36,11 @@ class AssertStepOld extends MablStep_1.MablStep {
         this.primaryAction = actions[0];
         this.extractAction = actions[1];
         if (args.length === 1) {
-            this.continueOnFailure = args[0].onFailure === 'continue';
+            this.onFailure = args[0].onFailure;
             this.observationScope = args[0].observationScope;
         }
         else if (args.length === 2) {
-            this.continueOnFailure = args[1].onFailure === 'continue';
+            this.onFailure = args[1].onFailure;
             this.observationScope = args[1].observationScope;
         }
     }
@@ -97,7 +97,7 @@ class AssertStepOld extends MablStep_1.MablStep {
                     throw new Error(`Error generating step descriptor for ${this.getStepName()}: Unexpected find type ${find.findType}`);
             }
         }
-        formatted.continueOnFailure = this.continueOnFailure;
+        formatted.onFailure = this.onFailure;
         formatted.observationScope = this.observationScope;
         return formatted;
     }

package/mablscript/steps/IfConditionStep.js

@@ -42,7 +42,7 @@ class IfConditionStep extends MablStep_1.MablStep {
             find,
             extractDescriptor: (_b = this.extractAction) === null || _b === void 0 ? void 0 : _b.extractDescriptor,
             conditionDescriptor,
-            continueOnFailure: false,
+            onFailure: AssertStep_1.OnFailure.FailImmediately,
             descriptorToActionMap: new Map().set(find, this.primaryAction),
         };
     }