d5-testing-library 1.8.0-alpha.0 → 1.8.0-alpha.10

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

@@ -138,7 +138,8 @@ declare enum ControlClass {
     Date = "date-control",
     SingleDateRange = "single-date-range-control",
     BooleanSelector = "buttons-group",
-    ButtonGroup = "button-group-field"
+    ButtonGroup = "button-group-field",
+    HeaderFilterDictionary = "header-filter-dictionary"
 }
 
 interface ClearStrategy {
@@ -241,12 +242,14 @@ declare class SubsystemsPanel extends AbstractElement {
 interface Button {
     click(): Promise<void>;
     isDisabled(): Promise<boolean>;
+    isDisplayed(): Promise<boolean>;
 }
 declare abstract class AbstractButton extends AbstractElementWithParent implements Button {
     protected constructor(parentCssSelector: string, elementCssSelector: string, driver?: WebDriver);
     protected abstract buttonNotDisplayedError(): string;
     click(): Promise<void>;
     isDisabled(): Promise<boolean>;
+    isDisplayed(): Promise<boolean>;
 }
 
 declare abstract class DXButton extends AbstractButton {
@@ -350,6 +353,14 @@ declare abstract class Form extends AbstractForm {
     subForm(name: string): Promise<unknown>;
 }
 
+declare class EditorButton extends AbstractElementWithParent {
+    private readonly name;
+    constructor(parentCssSelector: string, name: string, driver?: WebDriver);
+    protected buttonNotDisplayedError(): string;
+    click(): Promise<void>;
+    isDisplayed(): Promise<boolean>;
+}
+
 declare class AbstractEditor extends AbstractElementWithParent implements Editor {
     protected editor: Editor;
     constructor(parentCssSelector: string, elementCssSelector: string, driver?: WebDriver);
@@ -387,6 +398,14 @@ declare class AbstractEditor extends AbstractElementWithParent implements Editor
      * expect(await formEdit.field('TextFld').isReadonly()).toBe(false);
      */
     isReadonly(): Promise<boolean>;
+    /**
+     * Находит кнопку на поле по имени
+     * @example
+     * const form= new MyForm();
+     * //...
+     * await form.field('Name').button('editorButton).click()
+     */
+    button(name: string): EditorButton;
 }
 
 declare class FormField extends AbstractEditor {
@@ -394,9 +413,10 @@ declare class FormField extends AbstractEditor {
 }
 
 declare class FormEdit extends Form {
-    saveButtonBy: By;
-    closeButtonBy: By;
+    saveButtonId: string;
+    closeButtonId: string;
     constructor(driver: WebDriver);
+    private getButtonCssSelector;
     /**
      * Находит поле формы редактирования по имени
      * @example
@@ -450,6 +470,7 @@ declare class ToolbarItem extends AbstractElementWithParent implements Button {
     private init;
     click(): Promise<void>;
     isDisabled(): Promise<boolean>;
+    isDisplayed(): Promise<boolean>;
     get menu(): ToolbarMenu;
 }
 
@@ -495,7 +516,8 @@ declare class Row extends AbstractElementWithParent {
         title?: string;
         name?: string;
     }) => Column;
-    constructor(parentCssSelector: string, index: number, driver?: WebDriver, getColumnBy?: (_: {
+    protected fixedTableContentCssSelector: string;
+    constructor(parentCssSelector: string, fixedTableContentCssSelector: string, index: number, driver?: WebDriver, getColumnBy?: (_: {
         title?: string;
         name?: string;
     }) => Column);
@@ -517,7 +539,9 @@ declare class Row extends AbstractElementWithParent {
 declare class Table extends AbstractElementWithParent {
     protected formName: string;
     protected headerCssSelector: string;
-    constructor(parentCssSelector: string, headerCssSelector: string, formName: string, driver?: WebDriver);
+    protected fixedTableContentCssSelector: string;
+    protected tableContentCssSelector: string;
+    constructor(parentCssSelector: string, headerCssSelector: string, tableContentCssSelector: string, fixedTableContentCssSelector: string, formName: string, driver?: WebDriver);
     private getColumnBy;
     getRowByIndex(index: number): Row;
     getColumnByIndex(index: number): Column;
@@ -538,6 +562,8 @@ declare class Table extends AbstractElementWithParent {
 }
 
 declare class FormFilterField extends AbstractEditor {
+    private readonly formName;
+    private readonly name;
     constructor(parentCssSelector: string, formName: string, name: string, driver?: WebDriver);
     /**
      * Возвращает значение в поле
@@ -551,8 +577,9 @@ declare class FormFilterField extends AbstractEditor {
      * @example
      * await form.formFilter('NumberFld').setValue(123);
      * await form.formFilter('TextFld').setValue('TestValue');
+     * await form.formFilter('TextFld').setValue('TestValue', '=', true);
      */
-    setValue(value: any): Promise<void>;
+    setValue(value: any, operation?: string, isBlank?: boolean): Promise<void>;
     /**
      * Очищает значение в поле
      * @example
@@ -565,9 +592,39 @@ declare class FormFilterField extends AbstractEditor {
      * await form.formFilter('TagBox').remove('test');
      */
     remove(itemText: string): Promise<void>;
+    /**
+     * Инициализация операции фильтра
+     */
+    private initOperation;
+    /**
+     * Устанавливает операцию для фильтра
+     * @example
+     * await form.formFilter('TagBox').setOperation("=");
+     */
+    setOperation(operationName: string): Promise<void>;
+    /**
+     * Возвращает операцию фильтра
+     * @example
+     * expect(await form.formFilter('NumberFld').getOperation()).toBe("=");
+     */
+    getOperation(): Promise<any>;
+    /**
+     * Устанавливает операцию 'isblank' для фильтра
+     * @example
+     * await form.formFilter('TagBox').setIsBlank(true);
+     */
+    setIsBlank(value: boolean): Promise<void>;
+    /**
+     * Возвращает true|false, если операция 'isblank' установлена для фильтра
+     * @example
+     * expect(await form.formFilter('NumberFld').getIsBlank()).toBe(false);
+     */
+    getIsBlank(): Promise<boolean>;
 }
 
 declare class PanelFilterField extends AbstractEditor {
+    private readonly formName;
+    private readonly name;
     constructor(parentCssSelector: string, formName: string, name: string, driver?: WebDriver);
     /**
      * Возвращает значение в поле
@@ -581,8 +638,9 @@ declare class PanelFilterField extends AbstractEditor {
      * @example
      * await form.filterPanel.filterField('NumberFld').setValue(123);
      * await form.filterPanel.filterField('TextFld').setValue('TestValue');
+     * await form.filterPanel.filterField('TextFld').setValue('TestValue', '=', true);
      */
-    setValue(value: any): Promise<void>;
+    setValue(value: any, operation?: string, isBlank?: boolean): Promise<void>;
     /**
      * Очищает значение в поле
      * @example
@@ -595,6 +653,34 @@ declare class PanelFilterField extends AbstractEditor {
      * await form.filterPanel.filterField('TagBox').remove('test');
      */
     remove(itemText: string): Promise<void>;
+    /**
+     * Инициализация операции фильтра
+     */
+    private initOperation;
+    /**
+     * Устанавливает операцию для фильтра
+     * @example
+     * await form.filterPanel.filterField('TagBox').setOperation("=");
+     */
+    setOperation(operationName: string): Promise<void>;
+    /**
+     * Возвращает операцию фильтра
+     * @example
+     * expect(await form.filterPanel.filterField('NumberFld').getOperation()).toBe("=");
+     */
+    getOperation(): Promise<any>;
+    /**
+     * Устанавливает операцию 'isblank' для фильтра
+     * @example
+     * await form.filterPanel.filterField('TagBox').setIsBlank(true);
+     */
+    setIsBlank(value: boolean): Promise<void>;
+    /**
+     * Возвращает true|false, если операция 'isblank' установлена для фильтра
+     * @example
+     * expect(await form.filterPanel.filterField('NumberFld').getIsBlank()).toBe(false);
+     */
+    getIsBlank(): Promise<boolean>;
 }
 
 declare class FilterPanel extends AbstractElement {
@@ -623,6 +709,21 @@ declare class HeaderFilterField extends AbstractEditor {
     remove(itemText: string): Promise<void>;
 }
 
+interface IFilterOperations {
+    parentCssSelector: string;
+    filterTestID: string;
+    driver?: WebDriver;
+}
+declare class FilterOperation extends AbstractElementWithParent {
+    private readonly _testId;
+    constructor({ parentCssSelector, filterTestID, driver, }: IFilterOperations);
+    private initOperationWidget;
+    setOperation(operationName: string): Promise<void>;
+    getOperation(): Promise<any>;
+    setIsBlank(value: boolean): Promise<void>;
+    getIsBlank(): Promise<boolean>;
+}
+
 declare class ColumnFilter extends AbstractElement {
     private readonly _formName;
     private readonly _name;
@@ -645,8 +746,9 @@ declare class ColumnFilter extends AbstractElement {
      * @example
      * await form.columnFilter('NumberFld').setValue(123);
      * await form.columnFilter('TextFld').setValue('TestValue');
+     * await form.columnFilter('TextFld').setValue('TestValue', '=', true);
      */
-    setValue(value: any): Promise<void>;
+    setValue(value: any, operation?: string, isBlank?: boolean): Promise<void>;
     /**
      * Очищает значение в поле
      * @example
@@ -659,10 +761,40 @@ declare class ColumnFilter extends AbstractElement {
      * await form.columnFilter('TagBox').remove('test');
      */
     remove(itemText: string): Promise<void>;
+    /**
+     * Инициализация операции фильтра
+     */
+    initOperation(): Promise<FilterOperation>;
+    /**
+     * Устанавливает операцию для фильтра
+     * @example
+     * await form.columnFilter('TagBox').setOperation("=");
+     */
+    setOperation(operationName: string): Promise<void>;
+    /**
+     * Возвращает операцию фильтра
+     * @example
+     * expect(await form.columnFilter('NumberFld').getOperation()).toBe("=");
+     */
+    getOperation(): Promise<any>;
+    /**
+     * Устанавливает операцию 'isblank' для фильтра
+     * @example
+     * await form.columnFilter('TagBox').setIsBlank(true);
+     */
+    setIsBlank(value: boolean): Promise<void>;
+    /**
+     * Возвращает true|false, если операция 'isblank' установлена для фильтра
+     * @example
+     * expect(await form.columnFilter('NumberFld').getIsBlank()).toBe(false);
+     */
+    getIsBlank(): Promise<boolean>;
 }
 
 declare class ListForm extends Form {
     protected headerCssSelector: string;
+    protected fixedTableContentCssSelector: string;
+    protected tableContentCssSelector: string;
     constructor(driver: WebDriver);
     /**
      * Находит таблицу

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

@@ -1,15 +1,15 @@
 import {
   TreeView
-} from "./chunk-Q67RHZDP.mjs";
+} from "./chunk-6RIWBBNU.mjs";
 import {
   FilterPanel,
   FormFilterField,
   ListForm,
   PanelFilterField
-} from "./chunk-WUPIBFH7.mjs";
+} from "./chunk-PS3VVRTQ.mjs";
 import {
   FormEdit
-} from "./chunk-CKCSBNKD.mjs";
+} from "./chunk-MZW4BBF3.mjs";
 import {
   AbstractButton,
   AbstractElement,
@@ -30,7 +30,7 @@ import {
   readonlyLocator,
   wait,
   waitElementIsVisible
-} from "./chunk-JITTN2NY.mjs";
+} from "./chunk-NXQ4TYFN.mjs";
 
 // src/pageObjects/pages/LoginPage.ts
 var LOGIN_PATH = "/login";
@@ -225,12 +225,11 @@ var SubsystemsPanel = class extends AbstractElement {
 };
 
 // src/pageObjects/elements/Forms/ReportForm.ts
-import { By as By4 } from "selenium-webdriver";
 var ReportForm = class extends FormEdit {
   constructor(driver) {
     super(driver);
-    this.popupContainerCssSelector = `.popup .form-report-${this.formName}`;
-    this.saveButtonBy = By4.id("button-apply");
+    this.popupContainerCssSelector = `.popup.form-report-${this.formName}`;
+    this.saveButtonId = "#button-apply";
   }
   /**
    * Знаходить поле/фільтр у формі репорту за ім'ям
@@ -245,7 +244,7 @@ var ReportForm = class extends FormEdit {
 };
 
 // src/pageObjects/elements/Dialog.ts
-import { By as By5 } from "selenium-webdriver";
+import { By as By4 } from "selenium-webdriver";
 var DIALOG_CLASS = ".d5-dialog";
 var DIALOG_TITLE_CLASS = ".dialog__title";
 var DIALOG_TEXT_CLASS = ".dialog__text";
@@ -259,7 +258,7 @@ var DialogButton = class extends AbstractButton {
   }
   async getElement() {
     const panel = await super.getElement();
-    return panel.findElement(By5.xpath(buttonByTextXpath(this.text)));
+    return panel.findElement(By4.xpath(buttonByTextXpath(this.text)));
   }
   buttonNotDisplayedError() {
     return `Dialog button ${this.text} cannot be clicked. It is not displayed or it is disabled`;
@@ -279,11 +278,11 @@ var Dialog = class extends AbstractElement {
     return this.joinRelativeCssSelectors([DIALOG_CLASS, DIALOG_BUTTONS_PANEL_CLASS]);
   }
   async title() {
-    const el = await this.driver.findElement(By5.css(this.titleSelector));
+    const el = await this.driver.findElement(By4.css(this.titleSelector));
     return await el.getText();
   }
   async text() {
-    const el = await this.driver.findElement(By5.css(this.textSelector));
+    const el = await this.driver.findElement(By4.css(this.textSelector));
     return await el.getText();
   }
   button(text) {

package/dist/d5-testing-library.mjs

@@ -1,15 +1,15 @@
 import {
   TreeView
-} from "./chunk-Q67RHZDP.mjs";
+} from "./chunk-6RIWBBNU.mjs";
 import {
   FilterPanel,
   FormFilterField,
   ListForm,
   PanelFilterField
-} from "./chunk-WUPIBFH7.mjs";
+} from "./chunk-PS3VVRTQ.mjs";
 import {
   FormEdit
-} from "./chunk-CKCSBNKD.mjs";
+} from "./chunk-MZW4BBF3.mjs";
 import {
   AbstractButton,
   AbstractElement,
@@ -30,7 +30,7 @@ import {
   readonlyLocator,
   wait,
   waitElementIsVisible
-} from "./chunk-JITTN2NY.mjs";
+} from "./chunk-NXQ4TYFN.mjs";
 
 // src/pageObjects/pages/LoginPage.ts
 var LOGIN_PATH = "/login";
@@ -225,12 +225,11 @@ var SubsystemsPanel = class extends AbstractElement {
 };
 
 // src/pageObjects/elements/Forms/ReportForm.ts
-import { By as By4 } from "selenium-webdriver";
 var ReportForm = class extends FormEdit {
   constructor(driver) {
     super(driver);
-    this.popupContainerCssSelector = `.popup .form-report-${this.formName}`;
-    this.saveButtonBy = By4.id("button-apply");
+    this.popupContainerCssSelector = `.popup.form-report-${this.formName}`;
+    this.saveButtonId = "#button-apply";
   }
   /**
    * Знаходить поле/фільтр у формі репорту за ім'ям
@@ -245,7 +244,7 @@ var ReportForm = class extends FormEdit {
 };
 
 // src/pageObjects/elements/Dialog.ts
-import { By as By5 } from "selenium-webdriver";
+import { By as By4 } from "selenium-webdriver";
 var DIALOG_CLASS = ".d5-dialog";
 var DIALOG_TITLE_CLASS = ".dialog__title";
 var DIALOG_TEXT_CLASS = ".dialog__text";
@@ -259,7 +258,7 @@ var DialogButton = class extends AbstractButton {
   }
   async getElement() {
     const panel = await super.getElement();
-    return panel.findElement(By5.xpath(buttonByTextXpath(this.text)));
+    return panel.findElement(By4.xpath(buttonByTextXpath(this.text)));
   }
   buttonNotDisplayedError() {
     return `Dialog button ${this.text} cannot be clicked. It is not displayed or it is disabled`;
@@ -279,11 +278,11 @@ var Dialog = class extends AbstractElement {
     return this.joinRelativeCssSelectors([DIALOG_CLASS, DIALOG_BUTTONS_PANEL_CLASS]);
   }
   async title() {
-    const el = await this.driver.findElement(By5.css(this.titleSelector));
+    const el = await this.driver.findElement(By4.css(this.titleSelector));
     return await el.getText();
   }
   async text() {
-    const el = await this.driver.findElement(By5.css(this.textSelector));
+    const el = await this.driver.findElement(By4.css(this.textSelector));
     return await el.getText();
   }
   button(text) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "d5-testing-library",
-  "version": "1.8.0-alpha.0",
+  "version": "1.8.0-alpha.10",
   "description": "e2e testing D5 projects",
   "main": "dist/cjs/d5-testing-library.cjs",
   "module": "dist/d5-testing-library.legacy-esm.js",
@@ -32,19 +32,19 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "selenium-webdriver": "^4.17.0",
+    "selenium-webdriver": "4.25.0",
     "typescript": "5.3.3"
   },
   "devDependencies": {
     "@babel/core": "^7.23.9",
     "@types/node": "^20.11.16",
-    "@types/selenium-webdriver": "^4.1.21",
+    "@types/selenium-webdriver": "4.1.26",
     "commander": "12.0.0",
     "esbuild-extra": "^0.3.1",
     "rimraf": "^5.0.5",
     "tsup": "7.0.0"
   },
   "peerDependencies": {
-    "selenium-webdriver": "^4.17.0"
+    "selenium-webdriver": "4.25.0"
   }
 }

package/dist/FormEdit-XOCYARDX.mjs

@@ -1,7 +0,0 @@
-import {
-  FormEdit
-} from "./chunk-CKCSBNKD.mjs";
-import "./chunk-JITTN2NY.mjs";
-export {
-  FormEdit as default
-};

package/dist/ListForm-R7WQIGBI.mjs

@@ -1,7 +0,0 @@
-import {
-  ListForm
-} from "./chunk-WUPIBFH7.mjs";
-import "./chunk-JITTN2NY.mjs";
-export {
-  ListForm as default
-};

package/dist/TreeView-STUAAR65.mjs

@@ -1,8 +0,0 @@
-import {
-  TreeView
-} from "./chunk-Q67RHZDP.mjs";
-import "./chunk-WUPIBFH7.mjs";
-import "./chunk-JITTN2NY.mjs";
-export {
-  TreeView as default
-};

package/dist/chunk-Q67RHZDP.mjs

@@ -1,17 +0,0 @@
-import {
-  ListForm
-} from "./chunk-WUPIBFH7.mjs";
-
-// src/pageObjects/elements/Forms/TreeView.ts
-var TREELIST_HEADER_CSS_SELECTOR = ".dx-treelist-headers .dx-treelist-content:not(.dx-datagrid-content-fixed)";
-var TreeView = class extends ListForm {
-  constructor(driver) {
-    super(driver);
-    this.popupContainerCssSelector = `.popup .wrapper-tree-view-${this.formName}`;
-    this.headerCssSelector = TREELIST_HEADER_CSS_SELECTOR;
-  }
-};
-
-export {
-  TreeView
-};