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

package/build/src/assertions/ComponentListAssertions.js

@@ -53,7 +53,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentListAssertions = void 0;
 var BaseComponentAssertions_1 = require("./BaseComponentAssertions");
-var matchers_1 = require("../matchers");
+var extensions_1 = require("../extensions");
 var ComponentListAssertions = /** @class */ (function (_super) {
     __extends(ComponentListAssertions, _super);
     function ComponentListAssertions(componentList) {
@@ -65,7 +65,7 @@ var ComponentListAssertions = /** @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.componentList.itemsLocator.first()).toBeVisible(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.componentList).toBeVisibleEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -77,7 +77,7 @@ var ComponentListAssertions = /** @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.componentList.itemsLocator.first()).toBeHidden(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.componentList).toBeHiddenEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -89,7 +89,7 @@ var ComponentListAssertions = /** @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.componentList.itemsLocator).toHaveCount(count, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.componentList).toHaveCountEx(count, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -101,7 +101,7 @@ var ComponentListAssertions = /** @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.componentList.itemsLocator).toHaveCount(0, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.componentList).toBeEmptyEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -113,7 +113,7 @@ var ComponentListAssertions = /** @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.componentList.itemsLocator).not.toHaveCount(0, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.componentList).not.toBeEmptyEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];

package/build/src/assertions/CurrencyInputAssertions.js

@@ -53,7 +53,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CurrencyInputAssertions = void 0;
 var BaseComponentAssertions_1 = require("./BaseComponentAssertions");
-var matchers_1 = require("../matchers");
+var extensions_1 = require("../extensions");
 var CurrencyInputAssertions = /** @class */ (function (_super) {
     __extends(CurrencyInputAssertions, _super);
     function CurrencyInputAssertions(currencyInput) {
@@ -65,7 +65,7 @@ var CurrencyInputAssertions = /** @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.currencyInput.inputLocator).toBeEnabled(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.currencyInput).toBeEnabledEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -77,7 +77,7 @@ var CurrencyInputAssertions = /** @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.currencyInput.inputLocator).toBeDisabled(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.currencyInput).toBeDisabledEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -87,68 +87,24 @@ var CurrencyInputAssertions = /** @class */ (function (_super) {
     };
     CurrencyInputAssertions.prototype.toHaveValue = function (value, 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*/, this.currencyInput.blur()];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.currencyInput).toHaveValueEx(value, options)];
                     case 1:
                         _a.sent();
-                        if (!(typeof value === 'number')) return [3 /*break*/, 3];
-                        return [4 /*yield*/, matchers_1.mergedExpects
-                                .poll(function () { return __awaiter(_this, void 0, void 0, function () {
-                                var inputValue;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0: return [4 /*yield*/, this.currencyInput.getValue()];
-                                        case 1:
-                                            inputValue = _a.sent();
-                                            return [2 /*return*/, parseFloat(inputValue.replace(',', '.').replace(/\s/g, ''))];
-                                    }
-                                });
-                            }); }, options)
-                                .toBe(value)];
-                    case 2:
-                        _a.sent();
-                        return [3 /*break*/, 5];
-                    case 3: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.currencyInput.inputLocator).toHaveValue(value, options)];
-                    case 4:
-                        _a.sent();
-                        _a.label = 5;
-                    case 5: return [2 /*return*/];
+                        return [2 /*return*/];
                 }
             });
         });
     };
     CurrencyInputAssertions.prototype.notToHaveValue = function (value, 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*/, this.currencyInput.blur()];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.currencyInput).not.toHaveValueEx(value, options)];
                     case 1:
                         _a.sent();
-                        if (!(typeof value === 'number')) return [3 /*break*/, 3];
-                        return [4 /*yield*/, matchers_1.mergedExpects
-                                .poll(function () { return __awaiter(_this, void 0, void 0, function () {
-                                var inputValue;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0: return [4 /*yield*/, this.currencyInput.getValue()];
-                                        case 1:
-                                            inputValue = _a.sent();
-                                            return [2 /*return*/, parseFloat(inputValue.replace(',', '.').replace(/\s/g, ''))];
-                                    }
-                                });
-                            }); }, options)
-                                .not.toBe(value)];
-                    case 2:
-                        _a.sent();
-                        return [3 /*break*/, 5];
-                    case 3: return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.currencyInput.inputLocator).not.toHaveValue(value, options)];
-                    case 4:
-                        _a.sent();
-                        _a.label = 5;
-                    case 5: return [2 /*return*/];
+                        return [2 /*return*/];
                 }
             });
         });
@@ -157,11 +113,8 @@ var CurrencyInputAssertions = /** @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.currencyInput.blur()];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.currencyInput).toBeEmptyEx(options)];
                     case 1:
-                        _a.sent();
-                        return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.currencyInput.inputLocator).toBeEmpty(options)];
-                    case 2:
                         _a.sent();
                         return [2 /*return*/];
                 }
@@ -172,11 +125,8 @@ var CurrencyInputAssertions = /** @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.currencyInput.blur()];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.currencyInput).not.toBeEmptyEx(options)];
                     case 1:
-                        _a.sent();
-                        return [4 /*yield*/, (0, matchers_1.mergedExpects)(this.currencyInput.inputLocator).not.toBeEmpty(options)];
-                    case 2:
                         _a.sent();
                         return [2 /*return*/];
                 }
@@ -187,7 +137,7 @@ var CurrencyInputAssertions = /** @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.currencyInput.inputLocator).toBeFocused(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.currencyInput).toBeFocusedEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -199,7 +149,7 @@ var CurrencyInputAssertions = /** @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.currencyInput.inputLocator).not.toBeFocused(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.currencyInput).not.toBeFocusedEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];

package/build/src/assertions/DateInputAssertions.js

@@ -53,7 +53,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DateInputAssertions = void 0;
 var BaseComponentAssertions_1 = require("./BaseComponentAssertions");
-var matchers_1 = require("../matchers");
+var extensions_1 = require("../extensions");
 var DateInputAssertions = /** @class */ (function (_super) {
     __extends(DateInputAssertions, _super);
     function DateInputAssertions(dateInput) {
@@ -65,7 +65,7 @@ var DateInputAssertions = /** @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.dateInput.nativeInputLocator).toBeEnabled(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dateInput).toBeEnabledEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -77,7 +77,7 @@ var DateInputAssertions = /** @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.dateInput.nativeInputLocator).toBeDisabled(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dateInput).toBeDisabledEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -89,7 +89,7 @@ var DateInputAssertions = /** @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.dateInput.nativeInputLocator).toHaveValue(value, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dateInput).toHaveValueEx(value, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -101,7 +101,7 @@ var DateInputAssertions = /** @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.dateInput.nativeInputLocator).not.toHaveValue(value, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dateInput).not.toHaveValueEx(value, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -113,7 +113,7 @@ var DateInputAssertions = /** @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.dateInput.nativeInputLocator).toBeEmpty(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dateInput).toBeEmptyEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -125,7 +125,7 @@ var DateInputAssertions = /** @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.dateInput.nativeInputLocator).not.toBeEmpty(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dateInput).not.toBeEmptyEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -137,7 +137,7 @@ var DateInputAssertions = /** @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.dateInput.rootLocator).toBeFocused(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dateInput).toBeFocusedEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -149,7 +149,7 @@ var DateInputAssertions = /** @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.dateInput.rootLocator).not.toBeFocused(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dateInput).not.toBeFocusedEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];

package/build/src/assertions/DatePickerAssertions.js

@@ -53,7 +53,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DatePickerAssertions = void 0;
 var BaseComponentAssertions_1 = require("./BaseComponentAssertions");
-var matchers_1 = require("../matchers");
+var extensions_1 = require("../extensions");
 var DatePickerAssertions = /** @class */ (function (_super) {
     __extends(DatePickerAssertions, _super);
     function DatePickerAssertions(datePicker) {
@@ -65,7 +65,7 @@ var DatePickerAssertions = /** @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.datePicker.nativeInputLocator).toBeEnabled(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.datePicker).toBeEnabledEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -77,7 +77,7 @@ var DatePickerAssertions = /** @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.datePicker.nativeInputLocator).toBeDisabled(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.datePicker).toBeDisabledEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -89,7 +89,7 @@ var DatePickerAssertions = /** @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.datePicker.nativeInputLocator).toHaveValue(value, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.datePicker).toHaveValueEx(value, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -101,7 +101,7 @@ var DatePickerAssertions = /** @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.datePicker.nativeInputLocator).not.toHaveValue(value, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.datePicker).not.toHaveValueEx(value, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -113,7 +113,7 @@ var DatePickerAssertions = /** @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.datePicker.nativeInputLocator).toBeEmpty(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.datePicker).toBeEmptyEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -125,7 +125,7 @@ var DatePickerAssertions = /** @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.datePicker.nativeInputLocator).not.toBeEmpty(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.datePicker).not.toBeEmptyEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -137,7 +137,7 @@ var DatePickerAssertions = /** @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.datePicker.datePickerInputLocator).toBeFocused(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.datePicker).toBeFocusedEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -149,7 +149,7 @@ var DatePickerAssertions = /** @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.datePicker.datePickerInputLocator).not.toBeFocused(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.datePicker).not.toBeFocusedEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];

package/build/src/assertions/DateRangePickerAssertions.js

@@ -53,6 +53,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DateRangePickerAssertions = void 0;
 var BaseComponentAssertions_1 = require("./BaseComponentAssertions");
+var extensions_1 = require("../extensions");
 var DateRangePickerAssertions = /** @class */ (function (_super) {
     __extends(DateRangePickerAssertions, _super);
     function DateRangePickerAssertions(dateRangePicker) {
@@ -62,31 +63,12 @@ var DateRangePickerAssertions = /** @class */ (function (_super) {
     }
     DateRangePickerAssertions.prototype.toHaveValues = function (values) {
         return __awaiter(this, void 0, void 0, function () {
-            var start, end;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        start = values.start, end = values.end;
-                        if (!start) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.dateRangePicker.datePickerStart.expect().toHaveValue(start)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dateRangePicker).toHaveValueEx(values)];
                     case 1:
                         _a.sent();
-                        return [3 /*break*/, 4];
-                    case 2: return [4 /*yield*/, this.dateRangePicker.datePickerStart.expect().toBeEmpty()];
-                    case 3:
-                        _a.sent();
-                        _a.label = 4;
-                    case 4:
-                        if (!end) return [3 /*break*/, 6];
-                        return [4 /*yield*/, this.dateRangePicker.datePickerEnd.expect().toHaveValue(end)];
-                    case 5:
-                        _a.sent();
-                        return [3 /*break*/, 8];
-                    case 6: return [4 /*yield*/, this.dateRangePicker.datePickerEnd.expect().toBeEmpty()];
-                    case 7:
-                        _a.sent();
-                        _a.label = 8;
-                    case 8: return [2 /*return*/];
+                        return [2 /*return*/];
                 }
             });
         });
@@ -95,11 +77,8 @@ var DateRangePickerAssertions = /** @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.dateRangePicker.datePickerStart.expect().toBeEmpty()];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dateRangePicker).toBeEmptyEx()];
                     case 1:
-                        _a.sent();
-                        return [4 /*yield*/, this.dateRangePicker.datePickerEnd.expect().toBeEmpty()];
-                    case 2:
                         _a.sent();
                         return [2 /*return*/];
                 }

package/build/src/assertions/DropdownAssertions.js

@@ -53,7 +53,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DropdownAssertions = void 0;
 var BaseComponentAssertions_1 = require("./BaseComponentAssertions");
-var matchers_1 = require("../matchers");
+var extensions_1 = require("../extensions");
 var DropdownAssertions = /** @class */ (function (_super) {
     __extends(DropdownAssertions, _super);
     function DropdownAssertions(dropdown) {
@@ -65,7 +65,7 @@ var DropdownAssertions = /** @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.dropdown.buttonLocator).toBeEnabled(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dropdown).toBeEnabledEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -77,7 +77,7 @@ var DropdownAssertions = /** @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.dropdown.buttonLocator).toBeDisabled(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dropdown).toBeDisabledEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -89,7 +89,7 @@ var DropdownAssertions = /** @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.dropdown.buttonLocator).toHaveText(text, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dropdown).toHaveTextEx(text, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -101,7 +101,7 @@ var DropdownAssertions = /** @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.dropdown.buttonLocator).not.toHaveText(text, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dropdown).not.toHaveTextEx(text, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -113,7 +113,7 @@ var DropdownAssertions = /** @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.dropdown.buttonLocator).toContainText(text, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dropdown).toContainTextEx(text, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -125,7 +125,7 @@ var DropdownAssertions = /** @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.dropdown.buttonLocator).not.toContainText(text, options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dropdown).not.toContainTextEx(text, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -135,14 +135,10 @@ var DropdownAssertions = /** @class */ (function (_super) {
     };
     DropdownAssertions.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.dropdown.getMenuItems()];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dropdown).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*/];
                 }
@@ -151,14 +147,10 @@ var DropdownAssertions = /** @class */ (function (_super) {
     };
     DropdownAssertions.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.dropdown.getMenuItems()];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dropdown).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*/];
                 }
@@ -167,30 +159,9 @@ var DropdownAssertions = /** @class */ (function (_super) {
     };
     DropdownAssertions.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.dropdown.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.dropdown).toContainItemEx(itemText, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -200,30 +171,9 @@ var DropdownAssertions = /** @class */ (function (_super) {
     };
     DropdownAssertions.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.dropdown.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.dropdown).not.toContainItemEx(itemText, options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -235,7 +185,7 @@ var DropdownAssertions = /** @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.dropdown.buttonLocator).toBeFocused(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dropdown).toBeFocusedEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -247,7 +197,7 @@ var DropdownAssertions = /** @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.dropdown.buttonLocator).not.toBeFocused(options)];
+                    case 0: return [4 /*yield*/, (0, extensions_1.expect)(this.dropdown).not.toBeFocusedEx(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];