d5-testing-library 2.0.0-alpha.3 → 2.0.0-alpha.6

package/README.md

@@ -1 +1 @@
-//
+//.

package/dist/{FormEdit-FIYSIGH2.mjs → FormEdit-KTRSSTSI.mjs}

@@ -1,6 +1,6 @@
 import {
   FormEdit
-} from "./chunk-WZKO7TMT.mjs";
+} from "./chunk-N4PDOG6U.mjs";
 export {
   FormEdit as default
 };

package/dist/{ListForm-BE52U7IR.mjs → ListForm-H7E4GQWM.mjs}

@@ -1,6 +1,6 @@
 import {
   ListForm
-} from "./chunk-WZKO7TMT.mjs";
+} from "./chunk-N4PDOG6U.mjs";
 export {
   ListForm as default
 };

package/dist/{TreeView-AMVY2DII.mjs → TreeView-Q7YDCHQZ.mjs}

@@ -1,6 +1,6 @@
 import {
   TreeView
-} from "./chunk-WZKO7TMT.mjs";
+} from "./chunk-N4PDOG6U.mjs";
 export {
   TreeView as default
 };

package/dist/{chunk-WZKO7TMT.mjs → chunk-N4PDOG6U.mjs}

@@ -2941,6 +2941,15 @@ function createSubSystemTestId(itemName) {
 function createEditorButtonTestId(itemName) {
   return `${"editor-button" /* EDITOR_BUTTON */}-${itemName}`;
 }
+function createLabelFieldTestId(formName, itemName) {
+  return `${"label" /* LABEL */}-${createFieldTestId(formName, itemName)}`;
+}
+function createLabelDocFilterTestId(formName, itemName) {
+  return `${"label" /* LABEL */}-${createDocFilterTestId(formName, itemName)}`;
+}
+function createLabelLayoutFilterTestId(formName, itemName) {
+  return `${"label" /* LABEL */}-${createLayoutFilterTestId(formName, itemName)}`;
+}
 
 // src/pageObjects/AbstractElementWithParent.ts
 var AbstractElementWithParent = class extends AbstractElement {
@@ -3263,7 +3272,7 @@ var AbstractForm = class extends AbstractPage {
   async exists() {
     try {
       const container = this.page.locator(this.containerCssSelector);
-      await waitElementIsVisible_default({ locator: container });
+      await waitElementIsVisible_default({ locator: container, timeout: 3e3 });
       return true;
     } catch (error) {
       return false;
@@ -3308,15 +3317,15 @@ async function classDependencyInjector(formType) {
   let SubFormFactoryClass;
   switch (formType) {
     case "1" /* LIST */:
-      SubFormFactoryClass = (await import("./ListForm-BE52U7IR.mjs")).default;
+      SubFormFactoryClass = (await import("./ListForm-H7E4GQWM.mjs")).default;
       break;
     case "3" /* TREE */:
-      SubFormFactoryClass = (await import("./TreeView-AMVY2DII.mjs")).default;
+      SubFormFactoryClass = (await import("./TreeView-Q7YDCHQZ.mjs")).default;
       break;
     case "2" /* EDIT */:
     case "99" /* FREE_FORM */:
     case "4" /* REPORT */:
-      SubFormFactoryClass = (await import("./FormEdit-FIYSIGH2.mjs")).default;
+      SubFormFactoryClass = (await import("./FormEdit-KTRSSTSI.mjs")).default;
       break;
     default:
       throw new Error(`Unsupported form type ${formType}`);
@@ -4157,7 +4166,12 @@ var FormFilterField = class extends AbstractEditor {
   formName;
   name;
   constructor(parentCssSelector, formName, name, page) {
-    super(parentCssSelector, byTestIdCssSelector(createLayoutFilterTestId(formName, name)), page);
+    super({
+      parentCssSelector,
+      elementCssSelector: byTestIdCssSelector(createLayoutFilterTestId(formName, name)),
+      titleCssSelector: byTestIdCssSelector(createLabelLayoutFilterTestId(formName, name)),
+      page
+    });
     this.formName = formName;
     this.name = name;
   }
@@ -4261,7 +4275,12 @@ var PanelFilterField = class extends AbstractEditor {
   formName;
   name;
   constructor(parentCssSelector, formName, name, page) {
-    super(parentCssSelector, byTestIdCssSelector(createDocFilterTestId(formName, name)), page);
+    super({
+      parentCssSelector,
+      elementCssSelector: byTestIdCssSelector(createDocFilterTestId(formName, name)),
+      titleCssSelector: byTestIdCssSelector(createLabelDocFilterTestId(formName, name)),
+      page
+    });
     this.formName = formName;
     this.name = name;
   }
@@ -5001,11 +5020,7 @@ var SingleDateEditor = class extends BaseDateEditor {
   }
   async setValue(value) {
     if (value instanceof Date) {
-      await wait(async () => {
-        await this.setDateValue(value);
-        const updatedValue = await this.getValue();
-        return updatedValue.toDateString() === value.toDateString();
-      }, this.page);
+      await this.setDateValue(value);
     } else {
       throw new Error(`Value is incorrect. It should be a Date object`);
     }
@@ -5207,11 +5222,25 @@ var EditorButton = class extends AbstractElementWithParent {
   }
 };
 
+// src/pageObjects/elements/EditorTitle.ts
+var CAPTION_TEXT_CLASS = " .caption-text";
+var EditorTitle = class extends AbstractElementWithParent {
+  constructor({ parentCssSelector, elementCssSelector, page }) {
+    super(parentCssSelector, elementCssSelector, page);
+  }
+  async getTitle() {
+    const captionElement = this.getLocator().locator(CAPTION_TEXT_CLASS);
+    return captionElement.innerText();
+  }
+};
+
 // src/pageObjects/elements/AbstractEditor.ts
 var AbstractEditor = class extends AbstractElementWithParent {
   editor;
-  constructor(parentCssSelector, elementCssSelector, page) {
+  _titleCssSelector;
+  constructor({ parentCssSelector, elementCssSelector, titleCssSelector, page }) {
     super(parentCssSelector, elementCssSelector, page);
+    this._titleCssSelector = titleCssSelector;
   }
   async initEditor() {
     if (!this.editor) {
@@ -5307,12 +5336,30 @@ var AbstractEditor = class extends AbstractElementWithParent {
   button(name) {
     return new EditorButton(this.getFullCssSelector(), name, this.page);
   }
+  /**
+   * Повертає загловок едітора
+   * @example
+   * expect(await formEdit.field('NumberFld').title()).toBe('Title1');
+   * expect(await formEdit.field('TextFld').title()).toBe('Title2`);
+   */
+  async title() {
+    return new EditorTitle({
+      elementCssSelector: this._titleCssSelector,
+      parentCssSelector: this.parentCssSelector,
+      page: this.page
+    }).getTitle();
+  }
 };
 
 // src/pageObjects/elements/FormField.ts
 var FormField = class extends AbstractEditor {
   constructor(parentCssSelector, formName, name, page) {
-    super(parentCssSelector, byTestIdCssSelector(createFieldTestId(formName, name)), page);
+    super({
+      parentCssSelector,
+      elementCssSelector: byTestIdCssSelector(createFieldTestId(formName, name)),
+      titleCssSelector: byTestIdCssSelector(createLabelFieldTestId(formName, name)),
+      page
+    });
   }
 };
 
@@ -5850,7 +5897,10 @@ var ToolbarItem = class extends AbstractElementWithParent {
   async click() {
     try {
       await this.init();
-      await waitElementIsVisible_default({ locator: this._button.getLocator() });
+      await wait(async () => {
+        const element = this._button.getLocator();
+        return await element.isEnabled() && await element.isVisible();
+      }, this.page);
       await this._button.click();
     } catch (error) {
       throw new Error(`Cannot click on toolbar item: ${this._itemName}`);
@@ -5910,7 +5960,12 @@ var FormToolbar = class extends AbstractElementWithParent {
 // src/pageObjects/elements/Filters/HeaderFilterField.ts
 var HeaderFilterField = class extends AbstractEditor {
   constructor(parentCssSelector, formName, name, page) {
-    super(parentCssSelector, byTestIdCssSelector(createHeaderFilterTestId(formName, name)), page);
+    super({
+      parentCssSelector,
+      elementCssSelector: byTestIdCssSelector(createHeaderFilterTestId(formName, name)),
+      titleCssSelector: "",
+      page
+    });
   }
   async getValue() {
     return super.getValue();

package/dist/cjs/d5-testing-library.cjs

@@ -1057,7 +1057,6 @@ var init_SingleDateEditor = __esm({
     init_BaseDateEditor();
     init_utils();
     init_ClearButtonStrategy();
-    init_src();
     SingleDateEditor = class extends BaseDateEditor {
       constructor(parentCssSelector, elementCssSelector, page) {
         super(parentCssSelector, elementCssSelector, page);
@@ -1080,11 +1079,7 @@ var init_SingleDateEditor = __esm({
       }
       async setValue(value) {
         if (value instanceof Date) {
-          await wait(async () => {
-            await this.setDateValue(value);
-            const updatedValue = await this.getValue();
-            return updatedValue.toDateString() === value.toDateString();
-          }, this.page);
+          await this.setDateValue(value);
         } else {
           throw new Error(`Value is incorrect. It should be a Date object`);
         }
@@ -1385,6 +1380,15 @@ function createSubSystemTestId(itemName) {
 function createEditorButtonTestId(itemName) {
   return `${"editor-button" /* EDITOR_BUTTON */}-${itemName}`;
 }
+function createLabelFieldTestId(formName, itemName) {
+  return `${"label" /* LABEL */}-${createFieldTestId(formName, itemName)}`;
+}
+function createLabelDocFilterTestId(formName, itemName) {
+  return `${"label" /* LABEL */}-${createDocFilterTestId(formName, itemName)}`;
+}
+function createLabelLayoutFilterTestId(formName, itemName) {
+  return `${"label" /* LABEL */}-${createLayoutFilterTestId(formName, itemName)}`;
+}
 var init_createDataTestId = __esm({
   "src/utils/createDataTestId.ts"() {
     "use strict";
@@ -1863,7 +1867,7 @@ var init_AbstractForm = __esm({
       async exists() {
         try {
           const container = this.page.locator(this.containerCssSelector);
-          await waitElementIsVisible_default({ locator: container });
+          await waitElementIsVisible_default({ locator: container, timeout: 3e3 });
           return true;
         } catch (error) {
           return false;
@@ -2230,6 +2234,25 @@ var init_EditorButton = __esm({
   }
 });
 
+// src/pageObjects/elements/EditorTitle.ts
+var CAPTION_TEXT_CLASS, EditorTitle;
+var init_EditorTitle = __esm({
+  "src/pageObjects/elements/EditorTitle.ts"() {
+    "use strict";
+    init_AbstractElementWithParent();
+    CAPTION_TEXT_CLASS = " .caption-text";
+    EditorTitle = class extends AbstractElementWithParent {
+      constructor({ parentCssSelector, elementCssSelector, page }) {
+        super(parentCssSelector, elementCssSelector, page);
+      }
+      async getTitle() {
+        const captionElement = this.getLocator().locator(CAPTION_TEXT_CLASS);
+        return captionElement.innerText();
+      }
+    };
+  }
+});
+
 // src/pageObjects/elements/AbstractEditor.ts
 var AbstractEditor;
 var init_AbstractEditor2 = __esm({
@@ -2238,10 +2261,13 @@ var init_AbstractEditor2 = __esm({
     init_AbstractElementWithParent();
     init_Editors();
     init_EditorButton();
+    init_EditorTitle();
     AbstractEditor = class extends AbstractElementWithParent {
       editor;
-      constructor(parentCssSelector, elementCssSelector, page) {
+      _titleCssSelector;
+      constructor({ parentCssSelector, elementCssSelector, titleCssSelector, page }) {
         super(parentCssSelector, elementCssSelector, page);
+        this._titleCssSelector = titleCssSelector;
       }
       async initEditor() {
         if (!this.editor) {
@@ -2337,6 +2363,19 @@ var init_AbstractEditor2 = __esm({
       button(name) {
         return new EditorButton(this.getFullCssSelector(), name, this.page);
       }
+      /**
+       * Повертає загловок едітора
+       * @example
+       * expect(await formEdit.field('NumberFld').title()).toBe('Title1');
+       * expect(await formEdit.field('TextFld').title()).toBe('Title2`);
+       */
+      async title() {
+        return new EditorTitle({
+          elementCssSelector: this._titleCssSelector,
+          parentCssSelector: this.parentCssSelector,
+          page: this.page
+        }).getTitle();
+      }
     };
   }
 });
@@ -2351,7 +2390,12 @@ var init_FormField = __esm({
     init_AbstractEditor2();
     FormField = class extends AbstractEditor {
       constructor(parentCssSelector, formName, name, page) {
-        super(parentCssSelector, byTestIdCssSelector(createFieldTestId(formName, name)), page);
+        super({
+          parentCssSelector,
+          elementCssSelector: byTestIdCssSelector(createFieldTestId(formName, name)),
+          titleCssSelector: byTestIdCssSelector(createLabelFieldTestId(formName, name)),
+          page
+        });
       }
     };
   }
@@ -2956,6 +3000,7 @@ var init_ToolbarItem = __esm({
     init_locators();
     init_ToolbarMenu();
     init_waitElementIsVisible();
+    init_wait();
     GROUP_BUTTON_CLASS = "toolbar-group-button";
     toolbarItemSelector = (form, name) => byTestIdCssSelector(`ftb-${form}-${name}`);
     ToolbarItem = class extends AbstractElementWithParent {
@@ -2979,7 +3024,10 @@ var init_ToolbarItem = __esm({
       async click() {
         try {
           await this.init();
-          await waitElementIsVisible_default({ locator: this._button.getLocator() });
+          await wait(async () => {
+            const element = this._button.getLocator();
+            return await element.isEnabled() && await element.isVisible();
+          }, this.page);
           await this._button.click();
         } catch (error) {
           throw new Error(`Cannot click on toolbar item: ${this._itemName}`);
@@ -3154,7 +3202,12 @@ var init_FormFilterField = __esm({
       formName;
       name;
       constructor(parentCssSelector, formName, name, page) {
-        super(parentCssSelector, byTestIdCssSelector(createLayoutFilterTestId(formName, name)), page);
+        super({
+          parentCssSelector,
+          elementCssSelector: byTestIdCssSelector(createLayoutFilterTestId(formName, name)),
+          titleCssSelector: byTestIdCssSelector(createLabelLayoutFilterTestId(formName, name)),
+          page
+        });
         this.formName = formName;
         this.name = name;
       }
@@ -3268,7 +3321,12 @@ var init_PanelFilterField = __esm({
       formName;
       name;
       constructor(parentCssSelector, formName, name, page) {
-        super(parentCssSelector, byTestIdCssSelector(createDocFilterTestId(formName, name)), page);
+        super({
+          parentCssSelector,
+          elementCssSelector: byTestIdCssSelector(createDocFilterTestId(formName, name)),
+          titleCssSelector: byTestIdCssSelector(createLabelDocFilterTestId(formName, name)),
+          page
+        });
         this.formName = formName;
         this.name = name;
       }
@@ -3436,7 +3494,12 @@ var init_HeaderFilterField = __esm({
     init_AbstractEditor2();
     HeaderFilterField = class extends AbstractEditor {
       constructor(parentCssSelector, formName, name, page) {
-        super(parentCssSelector, byTestIdCssSelector(createHeaderFilterTestId(formName, name)), page);
+        super({
+          parentCssSelector,
+          elementCssSelector: byTestIdCssSelector(createHeaderFilterTestId(formName, name)),
+          titleCssSelector: "",
+          page
+        });
       }
       async getValue() {
         return super.getValue();

package/dist/cjs/d5-testing-library.d.ts

@@ -347,7 +347,13 @@ declare class EditorButton extends AbstractElementWithParent {
 
 declare class AbstractEditor extends AbstractElementWithParent implements Editor {
     protected editor: Editor;
-    constructor(parentCssSelector: string, elementCssSelector: string, page: Page);
+    protected _titleCssSelector: string;
+    constructor({ parentCssSelector, elementCssSelector, titleCssSelector, page }: {
+        parentCssSelector: string;
+        elementCssSelector: string;
+        titleCssSelector: string;
+        page: Page;
+    });
     protected initEditor(): Promise<void>;
     /**
      * Возвращает значение в поле
@@ -404,6 +410,13 @@ declare class AbstractEditor extends AbstractElementWithParent implements Editor
      * await form.field('Name').button('editorButton).click()
      */
     button(name: string): EditorButton;
+    /**
+     * Повертає загловок едітора
+     * @example
+     * expect(await formEdit.field('NumberFld').title()).toBe('Title1');
+     * expect(await formEdit.field('TextFld').title()).toBe('Title2`);
+     */
+    title(): Promise<string>;
 }
 
 declare class FormField extends AbstractEditor {

package/dist/d5-testing-library.d.mts

@@ -347,7 +347,13 @@ declare class EditorButton extends AbstractElementWithParent {
 
 declare class AbstractEditor extends AbstractElementWithParent implements Editor {
     protected editor: Editor;
-    constructor(parentCssSelector: string, elementCssSelector: string, page: Page);
+    protected _titleCssSelector: string;
+    constructor({ parentCssSelector, elementCssSelector, titleCssSelector, page }: {
+        parentCssSelector: string;
+        elementCssSelector: string;
+        titleCssSelector: string;
+        page: Page;
+    });
     protected initEditor(): Promise<void>;
     /**
      * Возвращает значение в поле
@@ -404,6 +410,13 @@ declare class AbstractEditor extends AbstractElementWithParent implements Editor
      * await form.field('Name').button('editorButton).click()
      */
     button(name: string): EditorButton;
+    /**
+     * Повертає загловок едітора
+     * @example
+     * expect(await formEdit.field('NumberFld').title()).toBe('Title1');
+     * expect(await formEdit.field('TextFld').title()).toBe('Title2`);
+     */
+    title(): Promise<string>;
 }
 
 declare class FormField extends AbstractEditor {

package/dist/d5-testing-library.legacy-esm.js

@@ -23,7 +23,7 @@ import {
   readonlyLocator,
   wait,
   waitElementIsVisible_default
-} from "./chunk-WZKO7TMT.mjs";
+} from "./chunk-N4PDOG6U.mjs";
 export {
   AbstractPage,
   ApiRequest,

package/dist/d5-testing-library.mjs

@@ -23,7 +23,7 @@ import {
   readonlyLocator,
   wait,
   waitElementIsVisible_default
-} from "./chunk-WZKO7TMT.mjs";
+} from "./chunk-N4PDOG6U.mjs";
 export {
   AbstractPage,
   ApiRequest,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "d5-testing-library",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.6",
   "description": "e2e testing D5 projects",
   "main": "dist/cjs/d5-testing-library.cjs",
   "module": "dist/d5-testing-library.legacy-esm.js",