@skbkontur/playwright-react-ui-components 1.13.2 → 1.14.0-beta.1

package/build/src/assertions/DropdownMenuAssertions.js

@@ -53,7 +53,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DropdownMenuAssertions = void 0;
 var BaseComponentAssertions_1 = require("./BaseComponentAssertions");
-var matchers_1 = require("../matchers");
+var extensions_1 = require("../extensions");
 var DropdownMenuAssertions = /** @class */ (function (_super) {
     __extends(DropdownMenuAssertions, _super);
     function DropdownMenuAssertions(dropdownMenu) {
@@ -65,7 +65,7 @@ var DropdownMenuAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.dropdownMenu.buttonLocator).toHaveText(text, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dropdownMenu).toHaveTextEx(text, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -77,7 +77,7 @@ var DropdownMenuAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.dropdownMenu.buttonLocator).not.toHaveText(text, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dropdownMenu).not.toHaveTextEx(text, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -89,7 +89,7 @@ var DropdownMenuAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.dropdownMenu.buttonLocator).toContainText(text, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dropdownMenu).toContainTextEx(text, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -101,7 +101,7 @@ var DropdownMenuAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.dropdownMenu.buttonLocator).not.toContainText(text, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dropdownMenu).not.toContainTextEx(text, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -111,14 +111,10 @@ var DropdownMenuAssertions = /** @class */ (function (_super) {
     };
     DropdownMenuAssertions.prototype.toHaveItems = function (itemsText, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var itemsLocator;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.dropdownMenu.getMenuItems()];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dropdownMenu).toHaveItemsEx(itemsText, options)];
                     case 1:
-                        itemsLocator = (_a.sent()).itemsLocator;
-                        return [4 /*yield*/, (0, matchers_1.mergedExpects)(itemsLocator).toHaveText(itemsText, options)];
-                    case 2:
                         _a.sent();
                         return [2 /*return*/];
                 }
@@ -127,14 +123,10 @@ var DropdownMenuAssertions = /** @class */ (function (_super) {
     };
     DropdownMenuAssertions.prototype.toContainItems = function (itemsText, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var itemsLocator;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.dropdownMenu.getMenuItems()];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dropdownMenu).toContainItemsEx(itemsText, options)];
                     case 1:
-                        itemsLocator = (_a.sent()).itemsLocator;
-                        return [4 /*yield*/, (0, matchers_1.mergedExpects)(itemsLocator).toContainText(itemsText, options)];
-                    case 2:
                         _a.sent();
                         return [2 /*return*/];
                 }
@@ -143,30 +135,9 @@ var DropdownMenuAssertions = /** @class */ (function (_super) {
     };
     DropdownMenuAssertions.prototype.toContainItem = function (itemText, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, matchers_1.mergedExpects
-                            .poll(function () { return __awaiter(_this, void 0, void 0, function () {
-                            var menus, _a, _b;
-                            var _this = this;
-                            return __generator(this, function (_c) {
-                                switch (_c.label) {
-                                    case 0: return [4 /*yield*/, this.dropdownMenu.getMenuItems()];
-                                    case 1:
-                                        menus = _c.sent();
-                                        _b = (_a = Promise).all;
-                                        return [4 /*yield*/, menus.getItems()];
-                                    case 2: return [2 /*return*/, _b.apply(_a, [(_c.sent()).map(function (x) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-                                                switch (_a.label) {
-                                                    case 0: return [4 /*yield*/, x.getText()];
-                                                    case 1: return [2 /*return*/, _a.sent()];
-                                                }
-                                            }); }); })])];
-                                }
-                            });
-                        }); }, options)
-                            .toContain(itemText)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dropdownMenu).toContainItemEx(itemText, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -176,30 +147,9 @@ var DropdownMenuAssertions = /** @class */ (function (_super) {
     };
     DropdownMenuAssertions.prototype.notToContainItem = function (itemText, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, matchers_1.mergedExpects
-                            .poll(function () { return __awaiter(_this, void 0, void 0, function () {
-                            var menus, _a, _b;
-                            var _this = this;
-                            return __generator(this, function (_c) {
-                                switch (_c.label) {
-                                    case 0: return [4 /*yield*/, this.dropdownMenu.getMenuItems()];
-                                    case 1:
-                                        menus = _c.sent();
-                                        _b = (_a = Promise).all;
-                                        return [4 /*yield*/, menus.getItems()];
-                                    case 2: return [2 /*return*/, _b.apply(_a, [(_c.sent()).map(function (x) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-                                                switch (_a.label) {
-                                                    case 0: return [4 /*yield*/, x.getText()];
-                                                    case 1: return [2 /*return*/, _a.sent()];
-                                                }
-                                            }); }); })])];
-                                }
-                            });
-                        }); }, options)
-                            .not.toContain(itemText)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dropdownMenu).not.toContainItemEx(itemText, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -211,7 +161,7 @@ var DropdownMenuAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.dropdownMenu.buttonLocator).toBeFocused(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dropdownMenu).toBeFocusedEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -223,7 +173,7 @@ var DropdownMenuAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.dropdownMenu.buttonLocator).not.toBeFocused(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dropdownMenu).not.toBeFocusedEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];

package/build/src/assertions/FileUploaderAssertions.d.ts

@@ -1,11 +1,9 @@
-import type { Locator } from '@playwright/test';
 import { BaseComponentAssertions } from './BaseComponentAssertions';
 import type { FileUploader } from '../components';
 import type { EnabledOptions } from '../options';
 export declare class FileUploaderAssertions extends BaseComponentAssertions {
     private readonly fileUploader;
-    private readonly inputLocator;
-    constructor(fileUploader: FileUploader, inputLocator: Locator);
+    constructor(fileUploader: FileUploader);
     toBeEnabled(options?: EnabledOptions): Promise<void>;
     toBeDisabled(options?: EnabledOptions): Promise<void>;
     toContainUploadedFiles(fileNames: string[], options?: {

package/build/src/assertions/FileUploaderAssertions.js

@@ -53,20 +53,19 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileUploaderAssertions = void 0;
 var BaseComponentAssertions_1 = require("./BaseComponentAssertions");
-var matchers_1 = require("../matchers");
+var extensions_1 = require("../extensions");
 var FileUploaderAssertions = /** @class */ (function (_super) {
     __extends(FileUploaderAssertions, _super);
-    function FileUploaderAssertions(fileUploader, inputLocator) {
+    function FileUploaderAssertions(fileUploader) {
         var _this = _super.call(this, fileUploader) || this;
         _this.fileUploader = fileUploader;
-        _this.inputLocator = inputLocator;
         return _this;
     }
     FileUploaderAssertions.prototype.toBeEnabled = function (options) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.inputLocator).toBeEnabled(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.fileUploader).toBeEnabledEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -78,7 +77,7 @@ var FileUploaderAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.inputLocator).toBeDisabled(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.fileUploader).toBeDisabledEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -88,25 +87,9 @@ var FileUploaderAssertions = /** @class */ (function (_super) {
     };
     FileUploaderAssertions.prototype.toContainUploadedFiles = function (fileNames, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var expectedLower;
-            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        expectedLower = fileNames.map(function (name) { return name.toLowerCase(); });
-                        return [4 /*yield*/, matchers_1.mergedExpects
-                                .poll(function () { return __awaiter(_this, void 0, void 0, function () {
-                                var names;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0: return [4 /*yield*/, this.fileUploader.getUploadedFileNames()];
-                                        case 1:
-                                            names = _a.sent();
-                                            return [2 /*return*/, names.map(function (name) { return name.toLowerCase(); })];
-                                    }
-                                });
-                            }); }, options)
-                                .toEqual(matchers_1.mergedExpects.arrayContaining(expectedLower))];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.fileUploader).toContainUploadedFilesEx(fileNames, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];

package/build/src/assertions/FxInputAssertions.js

@@ -52,7 +52,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FxInputAssertions = void 0;
-var matchers_1 = require("../matchers");
+var extensions_1 = require("../extensions");
 var BaseComponentAssertions_1 = require("./BaseComponentAssertions");
 var FxInputAssertions = /** @class */ (function (_super) {
     __extends(FxInputAssertions, _super);
@@ -65,7 +65,7 @@ var FxInputAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.fxInput.inputLocator).toBeEnabled(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.fxInput).toBeEnabledEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -77,7 +77,7 @@ var FxInputAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.fxInput.inputLocator).toBeDisabled(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.fxInput).toBeDisabledEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -89,7 +89,7 @@ var FxInputAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.fxInput.inputLocator).toHaveValue(value, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.fxInput).toHaveValueEx(value, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -101,7 +101,7 @@ var FxInputAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.fxInput.inputLocator).not.toHaveValue(value, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.fxInput).not.toHaveValueEx(value, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -113,7 +113,7 @@ var FxInputAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.fxInput.inputLocator).toBeEmpty(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.fxInput).toBeEmptyEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -125,7 +125,7 @@ var FxInputAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.fxInput.inputLocator).not.toBeEmpty(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.fxInput).not.toBeEmptyEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -137,7 +137,7 @@ var FxInputAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.fxInput.inputLocator).toBeFocused(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.fxInput).toBeFocusedEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -149,7 +149,7 @@ var FxInputAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.fxInput.inputLocator).not.toBeFocused(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.fxInput).not.toBeFocusedEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -161,11 +161,8 @@ var FxInputAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.fxInput.waitFor()];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.fxInput).toBeAutoEx()];
                     case 1:
-                        _a.sent();
-                        return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.fxInput.autoButtonLocator).toBeHidden()];
-                    case 2:
                         _a.sent();
                         return [2 /*return*/];
                 }
@@ -176,7 +173,7 @@ var FxInputAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.fxInput.autoButtonLocator).toBeVisible()];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.fxInput).not.toBeAutoEx()];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];

package/build/src/assertions/InputAssertions.js

@@ -53,7 +53,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InputAssertions = void 0;
 var BaseComponentAssertions_1 = require("./BaseComponentAssertions");
-var matchers_1 = require("../matchers");
+var extensions_1 = require("../extensions");
 var InputAssertions = /** @class */ (function (_super) {
     __extends(InputAssertions, _super);
     function InputAssertions(input) {
@@ -65,7 +65,7 @@ var InputAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.input.inputLocator).toBeEnabled(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.input).toBeEnabledEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -77,7 +77,7 @@ var InputAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.input.inputLocator).toBeDisabled(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.input).toBeDisabledEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -89,7 +89,7 @@ var InputAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.input.inputLocator).toHaveValue(value, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.input).toHaveValueEx(value, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -101,7 +101,7 @@ var InputAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.input.inputLocator).not.toHaveValue(value, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.input).not.toHaveValueEx(value, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -116,7 +116,7 @@ var InputAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.input.inputLocator).toHaveFormattedValue(value, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.input).toHaveFormattedValueEx(value, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -128,7 +128,7 @@ var InputAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.input.inputLocator).toBeEmpty(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.input).toBeEmptyEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -140,7 +140,7 @@ var InputAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.input.inputLocator).not.toBeEmpty(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.input).not.toBeEmptyEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -152,7 +152,7 @@ var InputAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.input.inputLocator).toBeFocused(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.input).toBeFocusedEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -164,7 +164,7 @@ var InputAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.input.inputLocator).not.toBeFocused(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.input).not.toBeFocusedEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];

package/build/src/assertions/KebabAssertions.js

@@ -53,8 +53,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KebabAssertions = void 0;
 var BaseComponentAssertions_1 = require("./BaseComponentAssertions");
-var utils_1 = require("../utils");
-var matchers_1 = require("../matchers");
+var extensions_1 = require("../extensions");
 var KebabAssertions = /** @class */ (function (_super) {
     __extends(KebabAssertions, _super);
     function KebabAssertions(kebab) {
@@ -66,7 +65,7 @@ var KebabAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.kebab.expect().notToHaveAttribute(utils_1.DataVisualState.Disabled, undefined, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.kebab).toBeEnabledEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -78,7 +77,7 @@ var KebabAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.kebab.expect().toHaveAttribute(utils_1.DataVisualState.Disabled, undefined, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.kebab).toBeDisabledEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -88,14 +87,10 @@ var KebabAssertions = /** @class */ (function (_super) {
     };
     KebabAssertions.prototype.toHaveItems = function (itemsText, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var itemsLocator;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.kebab.getMenuItems()];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.kebab).toHaveItemsEx(itemsText, options)];
                     case 1:
-                        itemsLocator = (_a.sent()).itemsLocator;
-                        return [4 /*yield*/, (0, matchers_1.mergedExpects)(itemsLocator).toHaveText(itemsText, options)];
-                    case 2:
                         _a.sent();
                         return [2 /*return*/];
                 }
@@ -104,14 +99,10 @@ var KebabAssertions = /** @class */ (function (_super) {
     };
     KebabAssertions.prototype.toContainItems = function (itemsText, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var itemsLocator;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.kebab.getMenuItems()];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.kebab).toContainItemsEx(itemsText, options)];
                     case 1:
-                        itemsLocator = (_a.sent()).itemsLocator;
-                        return [4 /*yield*/, (0, matchers_1.mergedExpects)(itemsLocator).toContainText(itemsText, options)];
-                    case 2:
                         _a.sent();
                         return [2 /*return*/];
                 }
@@ -120,30 +111,9 @@ var KebabAssertions = /** @class */ (function (_super) {
     };
     KebabAssertions.prototype.toContainItem = function (itemText, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, matchers_1.mergedExpects
-                            .poll(function () { return __awaiter(_this, void 0, void 0, function () {
-                            var menus, _a, _b;
-                            var _this = this;
-                            return __generator(this, function (_c) {
-                                switch (_c.label) {
-                                    case 0: return [4 /*yield*/, this.kebab.getMenuItems()];
-                                    case 1:
-                                        menus = _c.sent();
-                                        _b = (_a = Promise).all;
-                                        return [4 /*yield*/, menus.getItems()];
-                                    case 2: return [2 /*return*/, _b.apply(_a, [(_c.sent()).map(function (x) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-                                                switch (_a.label) {
-                                                    case 0: return [4 /*yield*/, x.getText()];
-                                                    case 1: return [2 /*return*/, _a.sent()];
-                                                }
-                                            }); }); })])];
-                                }
-                            });
-                        }); }, options)
-                            .toContain(itemText)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.kebab).toContainItemEx(itemText, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -153,30 +123,9 @@ var KebabAssertions = /** @class */ (function (_super) {
     };
     KebabAssertions.prototype.notToContainItem = function (itemText, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, matchers_1.mergedExpects
-                            .poll(function () { return __awaiter(_this, void 0, void 0, function () {
-                            var menus, _a, _b;
-                            var _this = this;
-                            return __generator(this, function (_c) {
-                                switch (_c.label) {
-                                    case 0: return [4 /*yield*/, this.kebab.getMenuItems()];
-                                    case 1:
-                                        menus = _c.sent();
-                                        _b = (_a = Promise).all;
-                                        return [4 /*yield*/, menus.getItems()];
-                                    case 2: return [2 /*return*/, _b.apply(_a, [(_c.sent()).map(function (x) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-                                                switch (_a.label) {
-                                                    case 0: return [4 /*yield*/, x.getText()];
-                                                    case 1: return [2 /*return*/, _a.sent()];
-                                                }
-                                            }); }); })])];
-                                }
-                            });
-                        }); }, options)
-                            .not.toContain(itemText)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.kebab).not.toContainItemEx(itemText, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];

package/build/src/assertions/LabelAssertions.js

@@ -53,7 +53,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LabelAssertions = void 0;
 var BaseComponentAssertions_1 = require("./BaseComponentAssertions");
-var matchers_1 = require("../matchers");
+var extensions_1 = require("../extensions");
 var LabelAssertions = /** @class */ (function (_super) {
     __extends(LabelAssertions, _super);
     function LabelAssertions(label) {
@@ -65,7 +65,7 @@ var LabelAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.label.rootLocator).toHaveText(text, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.label).toHaveTextEx(text, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -77,7 +77,7 @@ var LabelAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.label.rootLocator).not.toHaveText(text, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.label).not.toHaveTextEx(text, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -89,7 +89,7 @@ var LabelAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.label.rootLocator).toContainText(text, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.label).toContainTextEx(text, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -101,7 +101,7 @@ var LabelAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.label.rootLocator).not.toContainText(text, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.label).not.toContainTextEx(text, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -116,7 +116,7 @@ var LabelAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.label.rootLocator).toHaveFormattedText(text, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.label).toHaveFormattedTextEx(text, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -131,7 +131,7 @@ var LabelAssertions = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.label.rootLocator).toContainFormattedText(text, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.label).toContainFormattedTextEx(text, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];