@umbraco/playwright-testhelpers 17.0.19 → 17.1.0-beta.1

package/dist/lib/helpers/FormsUiHelper.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FormsUiHelper = void 0;
 const UiBaseLocators_1 = require("./UiBaseLocators");
-const test_1 = require("@playwright/test");
+const ConstantHelper_1 = require("./ConstantHelper");
 class FormsUiHelper extends UiBaseLocators_1.UiBaseLocators {
     quickCreateNewBtn;
     createNewFormModalBtn;
@@ -135,350 +135,311 @@ class FormsUiHelper extends UiBaseLocators_1.UiBaseLocators {
      * Methods for Forms.
      */
     async clickQuickCreateFormButton() {
-        await this.formMenuItemForForm.hover();
-        await this.formMenuItemForForm.locator(this.quickCreateNewBtn).click();
+        await this.hoverAndClick(this.formMenuItemForForm, this.formMenuItemForForm.locator(this.quickCreateNewBtn));
     }
     async clickNewFormButton() {
-        await (0, test_1.expect)(this.createNewFormModalBtn).toBeVisible();
-        await this.createNewFormModalBtn.click();
+        await this.click(this.createNewFormModalBtn);
     }
     async clickSaveFormButton() {
-        await this.saveFormBtn.click();
+        await this.click(this.saveFormBtn);
     }
     async fillFormName(name) {
-        await (0, test_1.expect)(this.formNameTxt).toBeVisible();
-        await this.formNameTxt.fill(name);
+        await this.enterText(this.formNameTxt, name);
     }
     async fillFormPageName(position, name) {
         const nameInput = this.formPageNametxt.nth(position);
-        await (0, test_1.expect)(nameInput).toBeVisible();
-        await nameInput.fill(name);
+        await this.enterText(nameInput, name);
     }
     async fillFormGroupName(position, name) {
         const groupInput = this.formGroupNameTxt.nth(position);
-        await (0, test_1.expect)(groupInput).toBeVisible();
-        await groupInput.fill(name);
+        await this.enterText(groupInput, name);
     }
     async fillFormFieldName(name) {
         await this.formEditFieldModal.locator(this.formFieldNameTxt).fill(name);
     }
     async clickAddNewPageButton() {
-        await this.formAddNewPageBtn.click();
+        await this.click(this.formAddNewPageBtn);
     }
     async clickAddNewGroupButton() {
-        await this.formAddNewGroupBtn.click();
+        await this.click(this.formAddNewGroupBtn);
     }
     async clickAddQuestionButton(index = 0) {
         const button = this.formPage.nth(index).locator(this.formAddQuestionBtn);
-        await button.click();
+        await this.click(button);
     }
     async chooseFormFieldType(type) {
-        await this.formFieldType.filter({ hasText: type }).nth(0).click();
+        await this.click(this.formFieldType.filter({ hasText: type }).nth(0));
     }
     async clickExpandFormsTreeButton() {
-        await this.formExpandBtn.click();
+        await this.click(this.formExpandBtn);
     }
     async doesFormTreeHaveFormName(name) {
-        await (0, test_1.expect)(this.formTree).toContainText(name);
+        await this.containsText(this.formTree, name);
     }
     async goToFormWithName(name) {
-        await this.formTree.getByText(name, { exact: true }).click();
+        await this.click(this.formTree.getByText(name, { exact: true }));
     }
     async clickFormFieldTypeSubmitModal() {
-        await this.formSubmitButtonModal.click();
+        await this.click(this.formSubmitButtonModal);
     }
     async clickActionMenuOnFormMenuItem(name) {
-        await this.menuItem.locator('[label="' + name + '"] uui-button[label="Open actions menu"]').click();
+        await this.click(this.menuItem.locator(`[label="${name}"] uui-button[label="Open actions menu"]`));
     }
     async clickDeleteFormButton() {
-        await this.formActionModal.locator(this.formDeleteThreeDotBtn).click();
-        await this.deleteExactBtn.click();
+        await this.click(this.formActionModal.locator(this.formDeleteThreeDotBtn));
+        await this.click(this.deleteExactBtn);
     }
     async goToFormSetting() {
-        await this.formWorkspaceEditor.locator(this.formSettingIcon).click();
+        await this.click(this.formWorkspaceEditor.locator(this.formSettingIcon));
     }
     async setFormStoreRecordsSetting() {
-        await (0, test_1.expect)(this.formSettingStoreRecordBtn).toBeVisible();
+        await this.waitForVisible(this.formSettingStoreRecordBtn);
         const toggle = this.formSettingStoreRecordBtn.locator(this.formToggleSlider);
-        await (0, test_1.expect)(toggle).toBeVisible();
+        await this.waitForVisible(toggle);
         await toggle.check();
     }
     async setFormCaptionsSetting() {
-        await (0, test_1.expect)(this.formSettingCaptionsContainer).toBeVisible();
+        await this.waitForVisible(this.formSettingCaptionsContainer);
         for (let i = 0; i < 3; i++) {
             const captionInput = this.formSettingCaptions.locator(this.formInputTxt).nth(i);
-            await (0, test_1.expect)(captionInput).toBeVisible();
-            await captionInput.fill("Test Caption " + (i + 1));
+            await this.enterText(captionInput, `Test Caption ${i + 1}`);
         }
     }
     async setFormStylingSetting() {
-        await (0, test_1.expect)(this.formSettingStylingContainer).toBeVisible();
+        await this.waitForVisible(this.formSettingStylingContainer);
         const cssClassInput = this.formSettingStyling.locator(this.formInputTxt);
-        await (0, test_1.expect)(cssClassInput).toBeVisible();
-        await cssClassInput.fill("custom-css-class");
+        await this.enterText(cssClassInput, "custom-css-class");
         const disableDefaultStylesheetInput = this.formSettingStyling.locator(this.formToggleSlider);
-        await (0, test_1.expect)(disableDefaultStylesheetInput).toBeVisible();
-        await disableDefaultStylesheetInput.click();
+        await this.click(disableDefaultStylesheetInput);
     }
     async setFormValidationSetting() {
-        await (0, test_1.expect)(this.formSettingValidationContainer).toBeVisible();
+        await this.waitForVisible(this.formSettingValidationContainer);
         const requiredErrorMessageInput = this.formSettingValidation.locator(this.formInputTxt).nth(0);
-        await (0, test_1.expect)(requiredErrorMessageInput).toBeVisible();
-        await requiredErrorMessageInput.fill("Required error message");
+        await this.enterText(requiredErrorMessageInput, "Required error message");
         const invalidErrorMessageInput = this.formSettingValidation.locator(this.formInputTxt).nth(1);
-        await (0, test_1.expect)(invalidErrorMessageInput).toBeVisible();
-        await invalidErrorMessageInput.fill("Invalid error message");
+        await this.enterText(invalidErrorMessageInput, "Invalid error message");
         const showValidationSummaryInput = this.formSettingValidation.locator(this.formToggleSlider).nth(0);
-        await (0, test_1.expect)(showValidationSummaryInput).toBeVisible();
-        await showValidationSummaryInput.click();
+        await this.click(showValidationSummaryInput);
         const hideFieldValidationInput = this.formSettingValidation.locator(this.formToggleSlider).nth(1);
-        await (0, test_1.expect)(hideFieldValidationInput).toBeVisible();
-        await hideFieldValidationInput.click();
+        await this.click(hideFieldValidationInput);
         const markMandatoryFieldRadioInput = this.formSettingValidation.locator("uui-radio[value = 'MarkMandatoryFields']");
-        await (0, test_1.expect)(markMandatoryFieldRadioInput).toBeVisible();
-        await markMandatoryFieldRadioInput.click();
+        await this.click(markMandatoryFieldRadioInput);
         const indicatorInput = this.formSettingValidation.locator(this.formInputTxt).nth(2);
-        await (0, test_1.expect)(indicatorInput).toBeVisible();
-        await indicatorInput.fill("+");
+        await this.enterText(indicatorInput, "+");
     }
     async setFormAutocompleteSetting() {
-        await (0, test_1.expect)(this.formSettingAutocompleteContainer).toBeVisible();
+        await this.waitForVisible(this.formSettingAutocompleteContainer);
         const autocompleteAttributeRadioInput = this.formSettingAutocomplete.locator('uui-radio[value = "On"]');
-        await (0, test_1.expect)(autocompleteAttributeRadioInput).toBeVisible();
-        await autocompleteAttributeRadioInput.click();
+        await this.click(autocompleteAttributeRadioInput);
     }
     async setFormModerationSetting() {
-        await (0, test_1.expect)(this.formSettingModerationContainer).toBeVisible();
+        await this.waitForVisible(this.formSettingModerationContainer);
         const enablePostModerationAttributeToggleInput = this.formSettingModeration.locator(this.formToggleSlider);
-        await (0, test_1.expect)(enablePostModerationAttributeToggleInput).toBeVisible();
-        await enablePostModerationAttributeToggleInput.click();
+        await this.click(enablePostModerationAttributeToggleInput);
     }
     async setFormFieldsDisplayedSetting() {
-        await (0, test_1.expect)(this.formSettingFieldsDisplayedContainer).toBeVisible();
+        await this.waitForVisible(this.formSettingFieldsDisplayedContainer);
         const displayDefaultFieldsToggleInput = this.formSettingFieldsDisplayed.locator(this.formToggleSlider);
-        await (0, test_1.expect)(displayDefaultFieldsToggleInput).toBeVisible();
-        await displayDefaultFieldsToggleInput.click();
-        await this.page.waitForTimeout(100); // short pause required here otherwise revealed elements are not found
+        await this.click(displayDefaultFieldsToggleInput);
+        await this.page.waitForTimeout(ConstantHelper_1.ConstantHelper.wait.minimal); // short pause required here otherwise revealed elements are not found
         const displayFieldsSelect = this.formSettingFieldsDisplayed.locator("select");
-        await (0, test_1.expect)(displayFieldsSelect).toBeVisible();
-        await displayFieldsSelect.selectOption({ value: '_system_state' });
+        await this.selectByValue(displayFieldsSelect, '_system_state');
         const displayFieldsAddButton = this.formSettingFieldsDisplayed.locator("button[id='button']");
-        await (0, test_1.expect)(displayFieldsAddButton).toBeVisible();
-        await displayFieldsAddButton.click();
+        await this.click(displayFieldsAddButton);
     }
     async setFormDataRetentionSetting(recordNumber) {
-        await (0, test_1.expect)(this.formSettingDataRetentionContainer).toBeVisible();
+        await this.waitForVisible(this.formSettingDataRetentionContainer);
         const retainSubmittedRecordsToggleInput = this.formSettingDataRetention.locator(this.formToggleSlider).nth(0);
-        await (0, test_1.expect)(retainSubmittedRecordsToggleInput).toBeVisible();
-        await retainSubmittedRecordsToggleInput.click();
-        await this.page.waitForTimeout(100); // short pause required here otherwise revealed elements are not found
+        await this.click(retainSubmittedRecordsToggleInput);
+        await this.page.waitForTimeout(ConstantHelper_1.ConstantHelper.wait.minimal); // short pause required here otherwise revealed elements are not found
         const retainSubmittedRecordsNumberInput = this.formSettingDataRetention.locator(this.formInputNumber).nth(0);
-        await (0, test_1.expect)(retainSubmittedRecordsNumberInput).toBeVisible();
-        await retainSubmittedRecordsNumberInput.fill(recordNumber);
+        await this.enterText(retainSubmittedRecordsNumberInput, recordNumber);
     }
     async toggleFieldSetting(settingAlias) {
-        const settingFieldLocator = this.page.locator('umb-property-layout[alias="' + settingAlias + '"] #toggle');
-        await (0, test_1.expect)(settingFieldLocator).toBeVisible();
-        await settingFieldLocator.click();
+        const settingFieldLocator = this.page.locator(`umb-property-layout[alias="${settingAlias}"] #toggle`);
+        await this.click(settingFieldLocator);
     }
     async applyFieldSettingViaTextInput(settingAlias, settingValue) {
-        const settingFieldLocator = this.page.locator('umb-property[alias="' + settingAlias + '"] input');
+        const settingFieldLocator = this.page.locator(`umb-property[alias="${settingAlias}"] input`);
         await settingFieldLocator.fill(settingValue);
     }
     async applyFieldSettingViaDropDown(settingAlias, settingValue) {
-        const settingFieldLocator = this.page.locator('umb-property[alias="' + settingAlias + '"] select');
-        await settingFieldLocator.selectOption({ value: settingValue });
+        const settingFieldLocator = this.page.locator(`umb-property[alias="${settingAlias}"] select`);
+        await this.selectByValue(settingFieldLocator, settingValue);
     }
     async applyFieldSettingViaSlider(settingAlias) {
-        const settingFieldLocator = this.page.locator('umb-property[alias="' + settingAlias + '"] #toggle');
-        await (0, test_1.expect)(settingFieldLocator).toBeVisible();
-        await settingFieldLocator.click();
+        const settingFieldLocator = this.page.locator(`umb-property[alias="${settingAlias}"] #toggle`);
+        await this.click(settingFieldLocator);
     }
     async applyFieldFileUploadSettings(settingAlias, allowedProvidedExtensions, allowedCustomExtensions, allowMultiple) {
-        const settingFieldLocator = this.page.locator('umb-property-layout[alias="' + settingAlias + '"]');
+        const settingFieldLocator = this.page.locator(`umb-property-layout[alias="${settingAlias}"]`);
         for (var i = 0; i < allowedProvidedExtensions.length; i++) {
             const checkBoxLocator = settingFieldLocator.locator('uui-toggle', { hasText: allowedProvidedExtensions[i].toUpperCase() }).locator('#toggle');
-            await (0, test_1.expect)(checkBoxLocator).toBeVisible();
-            await checkBoxLocator.click();
+            await this.click(checkBoxLocator);
         }
         const addNewExtensionLocator = settingFieldLocator.locator('input[placeholder = "Add new allowed file type"]');
-        await (0, test_1.expect)(addNewExtensionLocator).toBeVisible();
+        await this.waitForVisible(addNewExtensionLocator);
         const buttonLocator = settingFieldLocator.locator('form svg');
-        await (0, test_1.expect)(buttonLocator).toBeVisible();
+        await this.waitForVisible(buttonLocator);
         for (var i = 0; i < allowedCustomExtensions.length; i++) {
             await addNewExtensionLocator.fill(allowedCustomExtensions[i]);
-            await buttonLocator.click();
+            await this.click(buttonLocator);
         }
         if (allowMultiple) {
             const alias = "allowMultipleFileUploads";
-            const multipleUploadLocator = this.page.locator('umb-property-layout[alias="' + alias + '"] #toggle');
-            await (0, test_1.expect)(multipleUploadLocator).toBeVisible();
-            await multipleUploadLocator.click();
+            const multipleUploadLocator = this.page.locator(`umb-property-layout[alias="${alias}"] #toggle`);
+            await this.click(multipleUploadLocator);
         }
     }
     async applyFieldPrevalues(settingAlias, prevalues) {
-        const settingFieldLocator = this.page.locator('umb-property-layout[alias="' + settingAlias + '"]');
+        const settingFieldLocator = this.page.locator(`umb-property-layout[alias="${settingAlias}"]`);
         for (var i = 0; i < prevalues.length; i++) {
             const valueFieldLocator = settingFieldLocator.locator("input[placeholder = 'New value']");
-            await (0, test_1.expect)(valueFieldLocator).toBeVisible();
+            await this.waitForVisible(valueFieldLocator);
             await valueFieldLocator.fill(prevalues[i].value);
             const captionFieldLocator = settingFieldLocator.locator("input[placeholder = 'New caption']");
-            await (0, test_1.expect)(captionFieldLocator).toBeVisible();
+            await this.waitForVisible(captionFieldLocator);
             await captionFieldLocator.fill(prevalues[i].caption);
             const buttonLocator = settingFieldLocator.locator('uui-button[label="add"]');
-            await (0, test_1.expect)(buttonLocator).toBeVisible();
-            await buttonLocator.click();
+            await this.click(buttonLocator);
         }
     }
     async applyFieldSettingViaTextArea(settingAlias, settingValue) {
-        const settingFieldLocator = this.page.locator('umb-property[alias="' + settingAlias + '"] textarea');
+        const settingFieldLocator = this.page.locator(`umb-property[alias="${settingAlias}"] textarea`);
         await settingFieldLocator.fill(settingValue);
     }
     async applyFieldSettingViaRichTextInput(settingAlias, settingValue) {
-        const richTextAreaTxt = this.page.locator('umb-property[alias="' + settingAlias + '"] umb-property-editor-ui-tiptap').locator('#editor .tiptap');
-        await (0, test_1.expect)(richTextAreaTxt).toBeVisible();
+        const richTextAreaTxt = this.page.locator(`umb-property[alias="${settingAlias}"] umb-property-editor-ui-tiptap`).locator('#editor .tiptap');
+        await this.waitForVisible(richTextAreaTxt);
         await richTextAreaTxt.fill(settingValue);
     }
     async applyFieldSettingViaRange(settingAlias, settingValue) {
-        const settingFieldLocator = this.page.locator('umb-property[alias="' + settingAlias + '"]');
+        const settingFieldLocator = this.page.locator(`umb-property[alias="${settingAlias}"]`);
         await settingFieldLocator.locator('input[type="range"]').fill(settingValue);
     }
     async applyFieldSettingViaFieldMappingInput(settingAlias, settingValue) {
-        const settingFieldLocator = this.page.locator('umb-property[alias="' + settingAlias + '"]');
-        await (0, test_1.expect)(settingFieldLocator).toBeVisible();
+        const settingFieldLocator = this.page.locator(`umb-property[alias="${settingAlias}"]`);
+        await this.waitForVisible(settingFieldLocator);
         for (let i = 0; i < settingValue.length; i++) {
             const buttonLocator = settingFieldLocator.locator('uui-button[label="add"]');
-            await (0, test_1.expect)(buttonLocator).toBeVisible();
-            await buttonLocator.click();
+            await this.click(buttonLocator);
             const aliasInputLocator = settingFieldLocator.locator("input[placeholder = 'Alias']").nth(i);
-            await (0, test_1.expect)(aliasInputLocator).toBeVisible();
+            await this.waitForVisible(aliasInputLocator);
             await aliasInputLocator.fill(settingValue[i].alias);
             const staticValueInputLocator = settingFieldLocator.locator("input[placeholder = 'Static value']").nth(i);
-            await (0, test_1.expect)(staticValueInputLocator).toBeVisible();
+            await this.waitForVisible(staticValueInputLocator);
             await staticValueInputLocator.fill(settingValue[i].staticValue);
         }
     }
     async applyFieldSettingViaDocumentMapper(settingAlias, settingValue) {
-        const settingFieldLocator = this.page.locator('umb-property[alias="' + settingAlias + '"]');
-        await (0, test_1.expect)(settingFieldLocator).toBeVisible();
+        const settingFieldLocator = this.page.locator(`umb-property[alias="${settingAlias}"]`);
+        await this.waitForVisible(settingFieldLocator);
         const selectLocator = settingFieldLocator.locator("forms-document-mapper-property-editor select");
-        await selectLocator.selectOption({ value: settingValue.doctype });
+        await this.selectByValue(selectLocator, settingValue.doctype);
         const inputLocator = settingFieldLocator.locator('forms-document-mapper-property-editor input[type = "text"]');
-        await (0, test_1.expect)(inputLocator.first()).toBeVisible();
+        await this.waitForVisible(inputLocator.first());
         const inputLocatorCount = await inputLocator.count();
         for (let i = 0; i < inputLocatorCount; i++) {
-            await (0, test_1.expect)(inputLocator.nth(i)).toBeVisible();
+            await this.waitForVisible(inputLocator.nth(i));
             await inputLocator.nth(i).fill(settingValue.nameStaticValue);
         }
     }
     async applyFieldSettingViaEmailTemplatePicker(settingAlias, settingValue) {
-        const settingFieldLocator = this.page.locator('umb-property[alias="' + settingAlias + '"]');
-        await (0, test_1.expect)(settingFieldLocator).toBeVisible();
+        const settingFieldLocator = this.page.locator(`umb-property[alias="${settingAlias}"]`);
+        await this.waitForVisible(settingFieldLocator);
         const buttonLocator = settingFieldLocator.locator("#caret-button");
-        await buttonLocator.click();
+        await this.click(buttonLocator);
         const templateLocator = this.page.locator("#label-button", { hasText: settingValue });
-        await (0, test_1.expect)(templateLocator).toBeVisible();
-        await templateLocator.click();
+        await this.click(templateLocator);
     }
     async applyFieldSettingViaStandardFieldMappingInput(settingAlias, settingValue) {
-        const settingFieldLocator = this.page.locator('umb-property[alias="' + settingAlias + '"]');
-        await (0, test_1.expect)(settingFieldLocator).toBeVisible();
+        const settingFieldLocator = this.page.locator(`umb-property[alias="${settingAlias}"]`);
+        await this.waitForVisible(settingFieldLocator);
         for (let i = 0; i < settingValue.length; i++) {
             if (settingValue[i].include) {
-                const includeButtonLocator = settingFieldLocator.locator('div[data-umb-standard-field-mapping-include="' + settingValue[i].alias + '"] #toggle');
-                await includeButtonLocator.click();
+                const includeButtonLocator = settingFieldLocator.locator(`div[data-umb-standard-field-mapping-include="${settingValue[i].alias}"] #toggle`);
+                await this.click(includeButtonLocator);
             }
-            const keyNameButtonLocator = settingFieldLocator.locator('div[data-umb-standard-field-mapping-key-name="' + settingValue[i].alias + '"] input[type="text"]');
+            const keyNameButtonLocator = settingFieldLocator.locator(`div[data-umb-standard-field-mapping-key-name="${settingValue[i].alias}"] input[type="text"]`);
             await keyNameButtonLocator.fill(settingValue[0].keyName);
         }
     }
     async setFieldMandatory(message) {
-        await (0, test_1.expect)(this.formFieldMandatory).toBeVisible();
-        await this.formFieldMandatory.locator("#toggle").click();
-        await this.page.waitForTimeout(1000);
+        await this.click(this.formFieldMandatory.locator("#toggle"));
+        await this.page.waitForTimeout(ConstantHelper_1.ConstantHelper.wait.medium);
         const inputLocator = this.formFieldMandatory.locator(this.formInputTxt);
-        await (0, test_1.expect)(inputLocator).toBeVisible();
-        await inputLocator.fill(message);
+        await this.enterText(inputLocator, message);
     }
     async setFieldValidation(label, message) {
-        await (0, test_1.expect)(this.formFieldRegex).toBeVisible();
+        await this.waitForVisible(this.formFieldRegex);
         const selectLocator = this.formFieldRegex.locator("select");
-        await selectLocator.selectOption({ label: label });
-        await this.page.waitForTimeout(1000);
+        await this.selectByText(selectLocator, label);
+        await this.page.waitForTimeout(ConstantHelper_1.ConstantHelper.wait.medium);
         const inputLocator = this.formFieldRegex.locator("input");
-        await (0, test_1.expect)(inputLocator).toBeVisible();
-        await inputLocator.fill(message);
+        await this.enterText(inputLocator, message);
     }
     async clickFormWorkflowConfigureButton() {
-        await this.formWorkflowConfigureBtn.click();
+        await this.click(this.formWorkflowConfigureBtn);
     }
     async clickFormWorkflowEditSubmitButton() {
-        await this.formEditWorkflowModal.locator(this.formSubmitButtonModal).click();
+        await this.click(this.formEditWorkflowModal.locator(this.formSubmitButtonModal));
     }
     async clickFormWorkflowConfigureSubmitButton() {
-        await this.formConfigureWorkflowModal.locator(this.formSubmitButtonModal).click();
+        await this.click(this.formConfigureWorkflowModal.locator(this.formSubmitButtonModal));
     }
     async clickFormWorkflowAddButton() {
-        await this.formWorkflowOnSubmitStage.locator(this.formWorkflowAddButtonModal).click({ force: true });
+        await this.click(this.formWorkflowOnSubmitStage.locator(this.formWorkflowAddButtonModal), { force: true });
     }
     async selectWorkflowType(workflowType) {
-        this.page.locator('umb-ref-item[title="' + workflowType + '"]').click();
+        await this.click(this.page.locator(`umb-ref-item[title="${workflowType}"]`));
     }
     async fillWorkflowName(workflowName) {
-        await (0, test_1.expect)(this.formWorkflowNameTxt).toBeVisible();
-        await this.formWorkflowNameTxt.fill(workflowName);
+        await this.enterText(this.formWorkflowNameTxt, workflowName);
     }
     /*
      * Methods for Prevalue Source.
      */
     async clickQuickCreatePrevalueSourceButton() {
-        await (0, test_1.expect)(this.formMenuItemForPrevalueSource).toBeVisible();
-        await this.formMenuItemForPrevalueSource.hover();
-        await this.formMenuItemForPrevalueSource.locator(this.quickCreateNewBtn).click();
+        await this.hoverAndClick(this.formMenuItemForPrevalueSource, this.formMenuItemForPrevalueSource.locator(this.quickCreateNewBtn));
     }
     async clickPrevalueSourceTypeButton(type) {
         const button = this.createNewPrevaluesourceModalBtn.locator("#name", { hasText: type });
-        await (0, test_1.expect)(button).toBeVisible();
-        await button.click();
+        await this.click(button);
     }
     async clickExpandPrevalueSourceTreeButton() {
-        await this.prevalueSourceExpandBtn.click();
+        await this.click(this.prevalueSourceExpandBtn);
     }
     async goToPrevalueSourceWithName(name) {
-        await this.prevalueSourceTree.locator('uui-menu-item[label="' + name + '"]').click();
+        await this.click(this.prevalueSourceTree.locator(`uui-menu-item[label="${name}"]`));
     }
     async clickDeletePrevalueSourceButton(name) {
-        const prevalueSource = await this.prevalueSourceTree.locator('uui-menu-item[label="' + name + '"]');
-        await prevalueSource.locator(this.prevalueSourceDeleteBtn).click();
-        await this.deleteExactBtn.click();
+        const prevalueSource = this.prevalueSourceTree.locator(`uui-menu-item[label="${name}"]`);
+        await this.click(prevalueSource.locator(this.prevalueSourceDeleteBtn));
+        await this.click(this.deleteExactBtn);
     }
     async applyCacheOptions(option, timeValue = 0, timeUnit = "") {
-        await (0, test_1.expect)(this.prevalueSourceCacheContainer).toBeVisible();
-        const optionSelect = this.prevalueSourceCacheContainer.locator('uui-radio[value = "' + option + '"]');
-        await (0, test_1.expect)(optionSelect).toBeVisible();
-        await optionSelect.click();
+        await this.waitForVisible(this.prevalueSourceCacheContainer);
+        const optionSelect = this.prevalueSourceCacheContainer.locator(`uui-radio[value = "${option}"]`);
+        await this.click(optionSelect);
         if (option === "time") {
             const numberInput = this.prevalueSourceCacheContainer.locator("input[type='number']");
-            await (0, test_1.expect)(numberInput).toBeVisible();
+            await this.waitForVisible(numberInput);
             await numberInput.fill(timeValue.toString());
             const unitSelect = this.prevalueSourceCacheContainer.locator("select");
-            await (0, test_1.expect)(unitSelect).toBeVisible();
-            await unitSelect.selectOption({ value: timeUnit });
+            await this.selectByValue(unitSelect, timeUnit);
         }
     }
     async applyPrevalueSourceSettingViaNodeSelector(labelText, settingValue) {
-        const container = this.page.locator('umb-property[alias="' + labelText + '"]');
-        await (0, test_1.expect)(container).toBeVisible();
+        const container = this.page.locator(`umb-property[alias="${labelText}"]`);
+        await this.waitForVisible(container);
         const rootNode = container.locator('uui-button[label="Specify root node"]');
-        await (0, test_1.expect)(rootNode).toBeVisible();
-        await rootNode.click();
-        await (0, test_1.expect)(this.prevalueSourceOriginModal).toBeVisible();
-        const value = this.prevalueSourceOriginModal.locator('umb-ref-item[name="' + settingValue + '"]');
-        await (0, test_1.expect)(value).toBeVisible();
-        await value.click();
+        await this.click(rootNode);
+        await this.waitForVisible(this.prevalueSourceOriginModal);
+        const value = this.prevalueSourceOriginModal.locator(`umb-ref-item[name="${settingValue}"]`);
+        await this.click(value);
     }
     async checkPrevalueSourceTypeLabel() {
-        await (0, test_1.expect)(this.prevalueSourceTypeLabel).toBeVisible();
+        await this.waitForVisible(this.prevalueSourceTypeLabel);
     }
 }
 exports.FormsUiHelper = FormsUiHelper;