@mablhq/mabl-cli 1.61.8 → 2.0.3

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

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const EnterTextStep_1 = require("../../steps/EnterTextStep");
+const domUtil_1 = require("../../../../domUtil");
+const MablSymbol_1 = require("../../../MablSymbol");
+const StepTestsUtil_1 = require("../StepTestsUtil");
+const TestMobileFindDescriptors_1 = require("../TestMobileFindDescriptors");
+describe('EnterText steps parse correctly', () => {
+    it('Parses an EnterText step with a Find One selector', () => {
+        const find = {
+            findType: domUtil_1.FindType.FIND_ONE,
+            findTarget: {
+                selector: {
+                    iOS: {
+                        name: 'Name field',
+                    },
+                    uuid: '',
+                },
+            },
+        };
+        const enterTextStepDescriptor = {
+            find,
+            text: 'Mauro',
+        };
+        const steps = [
+            {
+                EnterText: enterTextStepDescriptor,
+            },
+        ];
+        (0, StepTestsUtil_1.parseAndValidateYamlConversion)(steps, EnterTextStep_1.EnterTextStep.stepName, enterTextStepDescriptor);
+        const enterTextStep = new EnterTextStep_1.EnterTextStep(enterTextStepDescriptor);
+        expect(enterTextStep.getInputVariables()).toHaveLength(0);
+    });
+    it('Parses an EnterText step with a Find One selector and a variable', () => {
+        const find = {
+            findType: domUtil_1.FindType.FIND_ONE,
+            findTarget: {
+                selector: {
+                    iOS: {
+                        name: '{{@varInFind}}',
+                    },
+                    uuid: '',
+                },
+            },
+        };
+        const enterTextStepDescriptor = {
+            find,
+            text: new MablSymbol_1.MablSymbol('user.input'),
+        };
+        const steps = [
+            {
+                EnterText: enterTextStepDescriptor,
+            },
+        ];
+        (0, StepTestsUtil_1.parseAndValidateYamlConversion)(steps, EnterTextStep_1.EnterTextStep.stepName, enterTextStepDescriptor);
+        const enterTextStep = new EnterTextStep_1.EnterTextStep(enterTextStepDescriptor);
+        expect(enterTextStep.getInputVariables()).toStrictEqual([
+            'varInFind',
+            'user.input',
+        ]);
+    });
+    it('Parses a WebView EnterText step with a Find One selector and a variable', () => {
+        const enterTextStepDescriptor = {
+            find: TestMobileFindDescriptors_1.iOSWebViewTextFieldMobileFindDescriptor,
+            text: new MablSymbol_1.MablSymbol('user.input'),
+        };
+        const steps = [
+            {
+                EnterText: enterTextStepDescriptor,
+            },
+        ];
+        (0, StepTestsUtil_1.parseAndValidateYamlConversion)(steps, EnterTextStep_1.EnterTextStep.stepName, enterTextStepDescriptor);
+    });
+});

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

@@ -0,0 +1,167 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const domUtil_1 = require("../../../../domUtil");
+const StepTestsUtil_1 = require("../StepTestsUtil");
+describe('Humanization of steps work', () => {
+    it('Humanizes an iOS Tap step properly for accessibility ID', () => {
+        const stepYaml = {
+            Tap: {
+                find: {
+                    findType: domUtil_1.FindType.FIND_ONE,
+                    findTarget: {
+                        selector: {
+                            iOS: {
+                                name: 'Name field',
+                                type: 'XCUIElementTypeButton',
+                            },
+                        },
+                    },
+                },
+                type: 'tap',
+            },
+        };
+        const step = (0, StepTestsUtil_1.loadRawStepIntoMablStep)(stepYaml);
+        expect(step.stepDescription()).toEqual(`Tap on "Name field" element`);
+    });
+    it('Humanizes an iOS Tap step properly for label', () => {
+        const stepYaml = {
+            Tap: {
+                find: {
+                    findType: domUtil_1.FindType.FIND_ONE,
+                    findTarget: {
+                        selector: {
+                            iOS: {
+                                type: 'XCUIElementTypeButton',
+                                label: 'Click here for more',
+                            },
+                        },
+                    },
+                },
+                type: 'tap',
+            },
+        };
+        const step = (0, StepTestsUtil_1.loadRawStepIntoMablStep)(stepYaml);
+        expect(step.stepDescription()).toEqual(`Tap on element with text "Click here for more"`);
+    });
+    it('Humanizes an iOS Tap step properly when only type is available', () => {
+        const stepYaml = {
+            Tap: {
+                find: {
+                    findType: domUtil_1.FindType.FIND_ONE,
+                    findTarget: {
+                        selector: {
+                            android: {},
+                            iOS: {
+                                type: 'XCUIElementTypeButton',
+                            },
+                        },
+                    },
+                },
+                type: 'tap',
+            },
+        };
+        const step = (0, StepTestsUtil_1.loadRawStepIntoMablStep)(stepYaml);
+        expect(step.stepDescription()).toEqual(`Tap on the "Button" element`);
+    });
+    it('Humanizes an android Tap step properly when text is available', () => {
+        const stepYaml = {
+            Tap: {
+                find: {
+                    findType: domUtil_1.FindType.FIND_ONE,
+                    findTarget: {
+                        selector: {
+                            android: {
+                                class: 'android.widget.Button',
+                                text: 'submit form',
+                            },
+                            iOS: {},
+                        },
+                    },
+                },
+                type: 'tap',
+            },
+        };
+        const step = (0, StepTestsUtil_1.loadRawStepIntoMablStep)(stepYaml);
+        expect(step.stepDescription()).toEqual(`Tap on element with text "submit form"`);
+    });
+    it('Humanizes an android Tap step properly when only class is available', () => {
+        const stepYaml = {
+            Tap: {
+                find: {
+                    findType: domUtil_1.FindType.FIND_ONE,
+                    findTarget: {
+                        selector: {
+                            android: {
+                                class: 'android.widget.Button',
+                            },
+                            iOS: {},
+                        },
+                    },
+                },
+                type: 'tap',
+            },
+        };
+        const step = (0, StepTestsUtil_1.loadRawStepIntoMablStep)(stepYaml);
+        expect(step.stepDescription()).toEqual(`Tap on "Button" element`);
+    });
+    it('Humanizes an iOS Enter Text step properly for accessibility ID', () => {
+        const stepYaml = {
+            EnterText: {
+                text: 'Bailey',
+                find: {
+                    findType: domUtil_1.FindType.FIND_ONE,
+                    findTarget: {
+                        selector: {
+                            iOS: {
+                                name: 'Name field',
+                                type: 'XCUIElementTypeButton',
+                            },
+                        },
+                    },
+                },
+            },
+        };
+        const step = (0, StepTestsUtil_1.loadRawStepIntoMablStep)(stepYaml);
+        expect(step.stepDescription()).toEqual(`Enter text "Bailey" in "Name field" element`);
+    });
+    it('Humanizes an iOS Enter Text step properly for label', () => {
+        const stepYaml = {
+            EnterText: {
+                text: 'Bailey',
+                find: {
+                    findType: domUtil_1.FindType.FIND_ONE,
+                    findTarget: {
+                        selector: {
+                            iOS: {
+                                type: 'XCUIElementTypeButton',
+                                label: 'add name here',
+                            },
+                        },
+                    },
+                },
+            },
+        };
+        const step = (0, StepTestsUtil_1.loadRawStepIntoMablStep)(stepYaml);
+        expect(step.stepDescription()).toEqual(`Enter text "Bailey" in element with text "add name here"`);
+    });
+    it('Humanizes an android Enter Text step properly using android text', () => {
+        const stepYaml = {
+            EnterText: {
+                text: 'Bailey',
+                find: {
+                    findType: domUtil_1.FindType.FIND_ONE,
+                    findTarget: {
+                        selector: {
+                            android: {
+                                class: 'android.widget.Button',
+                                text: 'submit form',
+                            },
+                        },
+                    },
+                },
+            },
+        };
+        const step = (0, StepTestsUtil_1.loadRawStepIntoMablStep)(stepYaml);
+        expect(step.stepDescription()).toEqual(`Enter text "Bailey" in element with text "submit form"`);
+    });
+});

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

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const NavigateBackStep_1 = require("../../steps/NavigateBackStep");
+const StepTestsUtil_1 = require("../StepTestsUtil");
+describe('NavigateBack steps parse correctly', () => {
+    it('Parses a NavigateBack step', () => {
+        const navigateBackStepDescriptor = {};
+        const steps = [
+            {
+                NavigateBack: navigateBackStepDescriptor,
+            },
+        ];
+        (0, StepTestsUtil_1.parseAndValidateYamlConversion)(steps, NavigateBackStep_1.NavigateBackStep.stepName, navigateBackStepDescriptor);
+    });
+    it('Humanizes a NavigateHome back', () => {
+        const stepYaml = {
+            NavigateBack: {},
+        };
+        const step = (0, StepTestsUtil_1.loadRawStepIntoMablStep)(stepYaml);
+        expect(step.stepDescription()).toEqual(`Navigate back`);
+    });
+});

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

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const NavigateHomeStep_1 = require("../../steps/NavigateHomeStep");
+const StepTestsUtil_1 = require("../StepTestsUtil");
+describe('NavigateHome steps parse correctly', () => {
+    it('Parses a NavigateHome step', () => {
+        const navigateHomeStepDescriptor = {};
+        const steps = [
+            {
+                NavigateHome: navigateHomeStepDescriptor,
+            },
+        ];
+        (0, StepTestsUtil_1.parseAndValidateYamlConversion)(steps, NavigateHomeStep_1.NavigateHomeStep.stepName, navigateHomeStepDescriptor);
+    });
+    it('Humanizes a NavigateHome step', () => {
+        const stepYaml = {
+            NavigateHome: {},
+        };
+        const step = (0, StepTestsUtil_1.loadRawStepIntoMablStep)(stepYaml);
+        expect(step.stepDescription()).toEqual(`Navigate home`);
+    });
+});

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

@@ -0,0 +1,112 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ScrollStep_1 = require("../../steps/ScrollStep");
+const StepTestsUtil_1 = require("../StepTestsUtil");
+describe('Scroll steps parse correctly', () => {
+    it('Parses a Scroll step', () => {
+        const windowSize = { width: 1440, height: 2392 };
+        const scrollStepDescriptor = {
+            coordinates: {
+                from: {
+                    xPercent: 1074 / windowSize.width,
+                    yPercent: 2350 / windowSize.height,
+                },
+                to: {
+                    xPercent: 1074 / windowSize.width,
+                    yPercent: 100 / windowSize.height,
+                },
+            },
+        };
+        const steps = [
+            {
+                Scroll: scrollStepDescriptor,
+            },
+        ];
+        (0, StepTestsUtil_1.parseAndValidateYamlConversion)(steps, ScrollStep_1.ScrollStep.stepName, scrollStepDescriptor);
+    });
+    it('Humanizes a scroll step', () => {
+        const windowSize = { width: 1440, height: 2392 };
+        const stepYaml = {
+            Scroll: {
+                coordinates: {
+                    from: {
+                        xPercent: 1074 / windowSize.width,
+                        yPercent: 2350 / windowSize.height,
+                    },
+                    to: {
+                        xPercent: 1074 / windowSize.width,
+                        yPercent: 100 / windowSize.height,
+                    },
+                },
+            },
+        };
+        const step = (0, StepTestsUtil_1.loadRawStepIntoMablStep)(stepYaml);
+        expect(step.stepDescription()).toEqual(`Scroll down 94.06% of the screen`);
+    });
+    it('Humanizes scroll directions as expected', () => {
+        const scrollUpStepYaml = {
+            Scroll: {
+                coordinates: {
+                    from: {
+                        xPercent: 0.109212,
+                        yPercent: 0.241223,
+                    },
+                    to: {
+                        xPercent: 0.145543,
+                        yPercent: 0.865454,
+                    },
+                },
+            },
+        };
+        const scrollUpStep = (0, StepTestsUtil_1.loadRawStepIntoMablStep)(scrollUpStepYaml);
+        expect(scrollUpStep.stepDescription()).toEqual(`Scroll up 62.42% of the screen`);
+        const scrollDownStepYaml = {
+            Scroll: {
+                coordinates: {
+                    from: {
+                        xPercent: 0.48351,
+                        yPercent: 0.89123,
+                    },
+                    to: {
+                        xPercent: 0.4515,
+                        yPercent: 0.0874,
+                    },
+                },
+            },
+        };
+        const scrollDownStep = (0, StepTestsUtil_1.loadRawStepIntoMablStep)(scrollDownStepYaml);
+        expect(scrollDownStep.stepDescription()).toEqual(`Scroll down 80.38% of the screen`);
+        const swipeRightStepYaml = {
+            Scroll: {
+                coordinates: {
+                    from: {
+                        xPercent: 0.08111,
+                        yPercent: 0.46123,
+                    },
+                    to: {
+                        xPercent: 0.90295,
+                        yPercent: 0.4574,
+                    },
+                },
+            },
+        };
+        const swipeRightStep = (0, StepTestsUtil_1.loadRawStepIntoMablStep)(swipeRightStepYaml);
+        expect(swipeRightStep.stepDescription()).toEqual(`Swipe right 82.18% of the screen`);
+        const swipeLeftStepYaml = {
+            Scroll: {
+                coordinates: {
+                    from: {
+                        xPercent: 0.88111,
+                        yPercent: 0.46123,
+                    },
+                    to: {
+                        xPercent: 0.09295,
+                        yPercent: 0.4574,
+                    },
+                },
+            },
+        };
+        const swipeLeftStep = (0, StepTestsUtil_1.loadRawStepIntoMablStep)(swipeLeftStepYaml);
+        expect(swipeLeftStep.stepDescription()).toEqual(`Swipe left 78.82% of the screen`);
+    });
+});

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

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const SetOrientationStep_1 = require("../../steps/SetOrientationStep");
+const SetOrientationStepDescriptor_1 = require("../../../types/mobile/SetOrientationStepDescriptor");
+const StepTestsUtil_1 = require("../StepTestsUtil");
+describe('SetOrientation steps parse correctly', () => {
+    it('Parses a SetOrientation step', () => {
+        const setOrientationStepDescriptor = {
+            orientation: SetOrientationStepDescriptor_1.Orientation.Landscape,
+        };
+        const steps = [
+            {
+                SetOrientation: setOrientationStepDescriptor,
+            },
+        ];
+        (0, StepTestsUtil_1.parseAndValidateYamlConversion)(steps, SetOrientationStep_1.SetOrientationStep.stepName, setOrientationStepDescriptor);
+    });
+    it('Humanizes a SetOrientation step', () => {
+        const stepYaml = {
+            SetOrientation: {
+                orientation: SetOrientationStepDescriptor_1.Orientation.Landscape,
+            },
+        };
+        const step = (0, StepTestsUtil_1.loadRawStepIntoMablStep)(stepYaml);
+        expect(step.stepDescription()).toEqual(`Set orientation of device to landscape`);
+    });
+});

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

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const TapStep_1 = require("../../steps/TapStep");
+const domUtil_1 = require("../../../../domUtil");
+const StepTestsUtil_1 = require("../StepTestsUtil");
+const TapStepDescriptor_1 = require("../../../types/mobile/TapStepDescriptor");
+const TestMobileFindDescriptors_1 = require("../TestMobileFindDescriptors");
+describe('Tap steps parse correctly', () => {
+    it('Parses a Tap step with a Find One selector', () => {
+        const find = {
+            findType: domUtil_1.FindType.FIND_ONE,
+            findTarget: {
+                selector: {
+                    iOS: {
+                        name: '{{@varInFind}}',
+                    },
+                    uuid: '',
+                },
+            },
+        };
+        const stepDescriptor = {
+            find,
+            type: TapStepDescriptor_1.TapType.tap,
+        };
+        const steps = [
+            {
+                Tap: stepDescriptor,
+            },
+        ];
+        (0, StepTestsUtil_1.parseAndValidateYamlConversion)(steps, TapStep_1.TapStep.stepName, stepDescriptor);
+        const tapStep = new TapStep_1.TapStep(stepDescriptor);
+        expect(tapStep.getInputVariables()).toStrictEqual(['varInFind']);
+    });
+    it('Parses a WebView Tap step', () => {
+        const stepDescriptor = {
+            find: TestMobileFindDescriptors_1.iOSWebViewTextFieldMobileFindDescriptor,
+            type: TapStepDescriptor_1.TapType.tap,
+        };
+        const steps = [
+            {
+                Tap: stepDescriptor,
+            },
+        ];
+        (0, StepTestsUtil_1.parseAndValidateYamlConversion)(steps, TapStep_1.TapStep.stepName, stepDescriptor);
+    });
+    it('Renders description for step without find', () => {
+        const stepDescriptor = {
+            type: TapStepDescriptor_1.TapType.tap,
+        };
+        const tapStep = new TapStep_1.TapStep(stepDescriptor);
+        expect(tapStep.stepDescription()).toEqual('Tap on unknown element');
+    });
+});

package/mablscript/steps/AssertStep.js

@@ -12,6 +12,7 @@ const GetCurrentLocationDescriptor_1 = require("../types/GetCurrentLocationDescr
 const GetVariableValue_1 = require("../actions/GetVariableValue");
 const GetVariableDescriptor_1 = require("../types/GetVariableDescriptor");
 const CountAction_1 = require("../actions/CountAction");
+const MobileFindAction_1 = require("../mobile/steps/actions/MobileFindAction");
 var OnFailure;
 (function (OnFailure) {
     OnFailure["ContinueWithWarning"] = "continue";
@@ -47,12 +48,13 @@ class AssertStep extends MablStep_1.MablStep {
         super(name, args, actions);
         const firstAction = actions[0];
         if (firstAction instanceof FindAction_1.FindAction ||
+            firstAction instanceof MobileFindAction_1.MobileFindAction ||
             firstAction instanceof GetUrlAction_1.GetUrlAction ||
             firstAction instanceof GetVariableValue_1.GetVariableValue) {
             this.primaryAction = firstAction;
         }
         else {
-            throw new Error(`Unexpected action type. Expected FindAction|GetUrlAction|GetVariableValue but got: ${firstAction.constructor.name}`);
+            throw new Error(`Unexpected action type. Expected FindAction|MobileFindAction|GetUrlAction|GetVariableValue but got: ${firstAction.constructor.name}`);
         }
         if (actions.length === 3) {
             if (actions[1] instanceof CountAction_1.CountAction) {
@@ -130,6 +132,7 @@ class AssertStep extends MablStep_1.MablStep {
         };
     }
     getFormattedStep(_fullLocatorsOn) {
+        var _a, _b;
         const result = {};
         result[this.getStepName()] = { ...this.annotationsAsYml() };
         const formatted = result[this.getStepName()];
@@ -144,49 +147,57 @@ class AssertStep extends MablStep_1.MablStep {
         if (this.assertionValue !== undefined) {
             formatted.assertionValue = this.assertionValue;
         }
-        const find = this.primaryAction.toDescriptor();
-        if ((0, GetCurrentLocationDescriptor_1.isGetCurrentLocationDescriptor)(find) || (0, GetVariableDescriptor_1.isGetVariableDescriptor)(find)) {
+        const targetDescriptor = this.primaryAction.toDescriptor();
+        if ((0, GetVariableDescriptor_1.isGetVariableDescriptor)(targetDescriptor)) {
+            formatted.target = (0, GetVariableDescriptor_1.convertGetVariableDescriptorToYaml)(targetDescriptor);
         }
         else {
-            switch (find.findType) {
-                case domUtil_1.FindType.FIND_EMAIL:
-                    formatted.findType = FindAction_1.findTypesToFormattedType[find.findType];
-                    formatted.selector = find.findTarget.selector;
-                    break;
-                case domUtil_1.FindType.FIND_COOKIE:
-                case domUtil_1.FindType.FIND_FIRST:
-                case domUtil_1.FindType.FIND_LAST:
-                case domUtil_1.FindType.FIND_ANY:
-                case domUtil_1.FindType.FIND_ALL:
-                    formatted.findType = FindAction_1.findTypesToFormattedType[find.findType];
-                    formatted.selector = find.findTarget;
-                    break;
-                case domUtil_1.FindType.FIND_ONE:
-                    formatted.selector = find.findTarget.selector;
-                    if (find.findOptions) {
-                        formatted.findOptions = find.findOptions;
-                    }
-                    break;
-                default:
-                    throw new Error(`Error generating step descriptor for ${this.getStepName()}: Unexpected find type ${find.findType}`);
-            }
+            formatted.target = targetDescriptor;
         }
         if (this.conditionAction.options) {
             formatted.conditionOptions = this.conditionAction.options;
         }
+        if (!!((_a = this.assertArguments) === null || _a === void 0 ? void 0 : _a.observationScope) ||
+            !!((_b = this.assertArguments) === null || _b === void 0 ? void 0 : _b.onFailure)) {
+            formatted.assertArguments = this.assertArguments;
+        }
+        result[this.getStepName()] =
+            MablStep_1.MablStep.cloneAndRemoveUndefinedEntriesFromObject(formatted);
         return result;
     }
     static fromYaml(stepName, stepArgs) {
+        var _a, _b, _c, _d, _e, _f, _g;
         const actions = [];
         const assertionType = exports.assertionStepToField[stepName];
         const assertionValue = stepArgs.assertionValue;
         const conditionOptions = stepArgs.conditionOptions;
         let primaryAction;
-        if (stepArgs.kind === GetCurrentLocationDescriptor_1.GET_CURRENT_LOCATION_KIND) {
+        if (((_a = stepArgs.target) === null || _a === void 0 ? void 0 : _a.kind) === GetCurrentLocationDescriptor_1.GET_CURRENT_LOCATION_KIND) {
             primaryAction = new GetUrlAction_1.GetUrlAction(GetUrlAction_1.GetUrlAction.mablScriptStepNames[0], []);
         }
+        else if (((_b = stepArgs.target) === null || _b === void 0 ? void 0 : _b.kind) === GetVariableDescriptor_1.GET_VARIABLE_VALUE) {
+            primaryAction = new GetVariableValue_1.GetVariableValue(GetVariableValue_1.GetVariableValue.mablScriptStepNames[0], [(_c = stepArgs.target) === null || _c === void 0 ? void 0 : _c.variable]);
+        }
+        else if ((0, domUtil_1.isNormalizedFindEmailDescriptor)((_d = stepArgs.target) === null || _d === void 0 ? void 0 : _d.findTarget) ||
+            (0, domUtil_1.isCookieSelector)((_e = stepArgs.target) === null || _e === void 0 ? void 0 : _e.findTarget) ||
+            (0, domUtil_1.isTabSelector)((_f = stepArgs.target) === null || _f === void 0 ? void 0 : _f.findTarget)) {
+            const { findTarget, findType } = stepArgs.target;
+            primaryAction = new FindAction_1.FindAction(findType, [findTarget]);
+        }
+        else if ((0, domUtil_1.isMobileFindDescriptor)(stepArgs.target)) {
+            primaryAction = MobileFindAction_1.MobileFindAction.fromDescriptor(stepArgs.target);
+        }
+        else if ((0, domUtil_1.isFindElementDescriptor)(stepArgs.target)) {
+            const { findOptions, findTarget, findType } = stepArgs.target;
+            if (findType === domUtil_1.FindType.FIND_ONE) {
+                primaryAction = new FindAction_1.FindAction(findType, [findTarget, findOptions]);
+            }
+            else {
+                primaryAction = new FindAction_1.FindAction(findType, [findTarget, findOptions]);
+            }
+        }
         else {
-            primaryAction = FindAction_1.FindAction.findActionFromStepArgs(stepArgs);
+            throw new Error(`Error parsing [${stepName}] with incompatible step arguments`);
         }
         actions.push(primaryAction);
         if (assertionType === 'present' || assertionType === 'not_present') {
@@ -199,11 +210,8 @@ class AssertStep extends MablStep_1.MablStep {
             if (stepArgs.attribute === 'count') {
                 actions.push(new CountAction_1.CountAction('count', [stepArgs.attribute]));
             }
-            else {
-                const extractArgs = stepArgs.extractionOptions
-                    ? [stepArgs.attribute, stepArgs.extractionOptions]
-                    : [stepArgs.attribute];
-                actions.push(new ExtractAction_1.ExtractAction(ExtractAction_1.ExtractAction.mablScriptTypeFromYamlType(stepArgs.extractType), extractArgs));
+            else if (((_g = stepArgs.target) === null || _g === void 0 ? void 0 : _g.kind) !== GetVariableDescriptor_1.GET_VARIABLE_VALUE) {
+                actions.push(new ExtractAction_1.ExtractAction(ExtractAction_1.ExtractAction.mablScriptTypeFromYamlType(stepArgs.extractType), [stepArgs.attribute]));
             }
             actions.push(new ConditionAction_1.ConditionAction('evaluate_condition', [
                 assertionType,
@@ -211,15 +219,17 @@ class AssertStep extends MablStep_1.MablStep {
                 conditionOptions,
             ]));
         }
-        return new AssertStep('assert', [
-            {
-                onFailure: stepArgs.onFailure,
-                observationScope: stepArgs.observationScope,
-            },
-        ], actions);
+        const assertStep = new AssertStep('assert', [stepArgs.assertArguments], actions);
+        if (stepArgs.annotation) {
+            assertStep.setAnnotation(stepArgs.annotation);
+        }
+        return assertStep;
     }
     toMablscript() {
         var _a, _b, _c, _d;
+        if (this.primaryAction instanceof MobileFindAction_1.MobileFindAction) {
+            throw new Error('Mobile steps do not generate mablscript');
+        }
         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)({

package/mablscript/steps/AssertStepOld.js

@@ -97,10 +97,38 @@ class AssertStepOld extends MablStep_1.MablStep {
                     throw new Error(`Error generating step descriptor for ${this.getStepName()}: Unexpected find type ${find.findType}`);
             }
         }
-        formatted.onFailure = this.onFailure;
-        formatted.observationScope = this.observationScope;
+        formatted.assertArguments = {
+            onFailure: this.onFailure,
+            observationScope: this.observationScope,
+        };
         return formatted;
     }
+    getFormattedStep(_fullLocatorsOn) {
+        const result = {};
+        result[this.getStepName()] = { ...this.annotationsAsYml() };
+        const formatted = result[this.getStepName()];
+        if (this.extractAction) {
+            formatted.attribute = this.extractAction.extractionAttribute;
+            formatted.extractType =
+                ExtractAction_1.ExtractAction.mablscriptToYamlType[this.extractAction.extractionType];
+        }
+        if (this.assertionType !== 'assert_present' &&
+            this.assertionType !== 'assert_not_present') {
+            formatted.assertionValue = this.assertAttribute;
+        }
+        const targetDescriptor = this.primaryAction.toDescriptor();
+        if ((0, GetVariableDescriptor_1.isGetVariableDescriptor)(targetDescriptor)) {
+            formatted.target = (0, GetVariableDescriptor_1.convertGetVariableDescriptorToYaml)(targetDescriptor);
+        }
+        else {
+            formatted.target = targetDescriptor;
+        }
+        formatted.assertArguments = {
+            onFailure: this.onFailure,
+            observationScope: this.observationScope,
+        };
+        return result;
+    }
     getNewAssertionStep() {
         const yamlified = (0, importer_1.yamlifyTheLoadedSteps)([this]);
         const reloadedSteps = (0, importer_1.loadYamlSteps)(yamlified);