@skbkontur/playwright-react-ui-components 1.14.0-beta.3 → 1.14.0-beta.4

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

@@ -1,7 +1,7 @@
 import { BaseComponentAssertions } from './BaseComponentAssertions';
 import type { DateRangePicker } from '../components';
 export declare class DateRangePickerAssertions extends BaseComponentAssertions {
-    private dateRangePicker;
+    private readonly dateRangePicker;
     constructor(dateRangePicker: DateRangePicker);
     toHaveValues(values: {
         start?: string;

package/build/src/extensions/mergedExpects.d.ts

@@ -1,5 +1,5 @@
 import type { Expect } from '@playwright/test';
-import { type FormattedMatchers } from '../matchers/index';
-import { type ComponentMatchers } from '../matchers/componentMatchers';
+import { type FormattedMatchers } from '../matchers';
+import { type ComponentMatchers } from '../matchers';
 export type ExtendedExpect = Expect<FormattedMatchers & ComponentMatchers>;
 export declare const expect: ExtendedExpect;

package/build/src/extensions/mergedExpects.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expect = void 0;
 var test_1 = require("@playwright/test");
-var index_1 = require("../matchers/index");
-var componentMatchers_1 = require("../matchers/componentMatchers");
-exports.expect = (0, test_1.mergeExpects)(test_1.expect, index_1.formattedMatchers, componentMatchers_1.componentMatchers);
+var matchers_1 = require("../matchers");
+var matchers_2 = require("../matchers");
+exports.expect = (0, test_1.mergeExpects)(test_1.expect, matchers_1.formattedMatchers, matchers_2.componentMatchers);

package/build/src/matchers/component/toBeActiveTab.js

@@ -38,7 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toBeActiveTab = void 0;
 var test_1 = require("@playwright/test");
-var constants_1 = require("../../utils/constants");
+var utils_1 = require("../../utils");
 var createAsyncMatcher_1 = require("../createAsyncMatcher");
 exports.toBeActiveTab = (0, createAsyncMatcher_1.createComponentAsyncMatcher)('toBeActiveTab', function (component) { return component.rootLocator; }, function (_a, options_1) { return __awaiter(void 0, [_a, options_1], void 0, function (_b, options) {
     var expectation;
@@ -47,7 +47,7 @@ exports.toBeActiveTab = (0, createAsyncMatcher_1.createComponentAsyncMatcher)('t
         switch (_c.label) {
             case 0:
                 expectation = isNot ? (0, test_1.expect)(locator).not : (0, test_1.expect)(locator);
-                return [4 /*yield*/, expectation.toHaveAttribute(constants_1.DataVisualState.Active, options)];
+                return [4 /*yield*/, expectation.toHaveAttribute(utils_1.DataVisualState.Active, options)];
             case 1:
                 _c.sent();
                 return [2 /*return*/];

package/build/src/matchers/component/toBeDisabledEx.js

@@ -39,7 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toBeDisabledEx = void 0;
 var test_1 = require("@playwright/test");
 var components_1 = require("../../components");
-var constants_1 = require("../../utils/constants");
+var utils_1 = require("../../utils");
 var extensions_1 = require("../../extensions");
 var LocatorSymbols_1 = require("./LocatorSymbols");
 var createAsyncMatcher_1 = require("../createAsyncMatcher");
@@ -96,7 +96,7 @@ function checkSelect(component, isNot, locator, options) {
                     return [4 /*yield*/, component.isLinkSelect()];
                 case 1:
                     if (!_a.sent()) return [3 /*break*/, 3];
-                    return [4 /*yield*/, expectation.toHaveAttribute(constants_1.DataVisualState.Disabled, options)];
+                    return [4 /*yield*/, expectation.toHaveAttribute(utils_1.DataVisualState.Disabled, options)];
                 case 2:
                     _a.sent();
                     return [3 /*break*/, 5];
@@ -161,7 +161,7 @@ function checkAttribute(component, isNot, options) {
             switch (_a.label) {
                 case 0:
                     expectation = isNot ? (0, extensions_1.expect)(component).not : (0, extensions_1.expect)(component);
-                    return [4 /*yield*/, expectation.toHaveAttributeEx(constants_1.DataVisualState.Disabled, undefined, options)];
+                    return [4 /*yield*/, expectation.toHaveAttributeEx(utils_1.DataVisualState.Disabled, undefined, options)];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];

package/build/src/matchers/component/toBeEmptyEx.js

@@ -64,7 +64,7 @@ exports.toBeEmptyEx = (0, createAsyncMatcher_1.createAsyncMatcher)('toBeEmptyEx'
             case 4:
                 _d.sent();
                 return [3 /*break*/, 9];
-            case 5: return [4 /*yield*/, checkComponentList(isNot, locator, options)];
+            case 5: return [4 /*yield*/, checkComponentList(isNot, component, locator, options)];
             case 6:
                 _d.sent();
                 return [3 /*break*/, 9];
@@ -119,15 +119,18 @@ function checkDateRangePicker(component) {
         });
     });
 }
-function checkComponentList(isNot, locator, options) {
+function checkComponentList(isNot, component, locator, options) {
     return __awaiter(this, void 0, void 0, function () {
         var expectation;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     expectation = isNot ? (0, test_1.expect)(locator).not : (0, test_1.expect)(locator);
-                    return [4 /*yield*/, expectation.toHaveCount(0, options)];
+                    return [4 /*yield*/, component.waitFor({ state: 'attached' })];
                 case 1:
+                    _a.sent();
+                    return [4 /*yield*/, expectation.toHaveCount(0, options)];
+                case 2:
                     _a.sent();
                     return [2 /*return*/];
             }

package/build/src/matchers/component/toBeEnabledEx.js

@@ -50,7 +50,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toBeEnabledEx = void 0;
 var test_1 = require("@playwright/test");
 var components_1 = require("../../components");
-var constants_1 = require("../../utils/constants");
+var utils_1 = require("../../utils");
 var extensions_1 = require("../../extensions");
 var LocatorSymbols_1 = require("./LocatorSymbols");
 var createAsyncMatcher_1 = require("../createAsyncMatcher");
@@ -107,7 +107,7 @@ function checkSelect(component, isNot, locator, options) {
                     return [4 /*yield*/, component.isLinkSelect()];
                 case 1:
                     if (!_a.sent()) return [3 /*break*/, 3];
-                    return [4 /*yield*/, expectation.not.toHaveAttribute(constants_1.DataVisualState.Disabled, options)];
+                    return [4 /*yield*/, expectation.not.toHaveAttribute(utils_1.DataVisualState.Disabled, options)];
                 case 2:
                     _a.sent();
                     return [3 /*break*/, 5];
@@ -181,11 +181,11 @@ function checkAttribute(component, isNot, options) {
             switch (_a.label) {
                 case 0:
                     if (!isNot) return [3 /*break*/, 2];
-                    return [4 /*yield*/, (0, extensions_1.expect)(component).toHaveAttributeEx(constants_1.DataVisualState.Disabled, undefined, options)];
+                    return [4 /*yield*/, (0, extensions_1.expect)(component).toHaveAttributeEx(utils_1.DataVisualState.Disabled, undefined, options)];
                 case 1:
                     _a.sent();
                     return [3 /*break*/, 4];
-                case 2: return [4 /*yield*/, (0, extensions_1.expect)(component).not.toHaveAttributeEx(constants_1.DataVisualState.Disabled, undefined, options)];
+                case 2: return [4 /*yield*/, (0, extensions_1.expect)(component).not.toHaveAttributeEx(utils_1.DataVisualState.Disabled, undefined, options)];
                 case 3:
                     _a.sent();
                     _a.label = 4;

package/build/src/matchers/component/toBeInactiveTab.js

@@ -38,7 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toBeInactiveTab = void 0;
 var test_1 = require("@playwright/test");
-var constants_1 = require("../../utils/constants");
+var utils_1 = require("../../utils");
 var createAsyncMatcher_1 = require("../createAsyncMatcher");
 exports.toBeInactiveTab = (0, createAsyncMatcher_1.createComponentAsyncMatcher)('toBeInactiveTab', function (component) { return component.rootLocator; }, function (_a, options_1) { return __awaiter(void 0, [_a, options_1], void 0, function (_b, options) {
     var expectation;
@@ -47,7 +47,7 @@ exports.toBeInactiveTab = (0, createAsyncMatcher_1.createComponentAsyncMatcher)(
         switch (_c.label) {
             case 0:
                 expectation = isNot ? (0, test_1.expect)(locator).not : (0, test_1.expect)(locator);
-                return [4 /*yield*/, expectation.not.toHaveAttribute(constants_1.DataVisualState.Active, options)];
+                return [4 /*yield*/, expectation.not.toHaveAttribute(utils_1.DataVisualState.Active, options)];
             case 1:
                 _c.sent();
                 return [2 /*return*/];

package/build/src/matchers/component/toHaveActivePage.js

@@ -38,7 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toHaveActivePage = void 0;
 var test_1 = require("@playwright/test");
-var constants_1 = require("../../utils/constants");
+var utils_1 = require("../../utils");
 var createAsyncMatcher_1 = require("../createAsyncMatcher");
 exports.toHaveActivePage = (0, createAsyncMatcher_1.createComponentAsyncMatcher)('toHaveActivePage', function (component) { return component.rootLocator; }, function (_a, expectedPageNumber_1, options_1) { return __awaiter(void 0, [_a, expectedPageNumber_1, options_1], void 0, function (_b, expectedPageNumber, options) {
     var expectation;
@@ -52,7 +52,7 @@ exports.toHaveActivePage = (0, createAsyncMatcher_1.createComponentAsyncMatcher)
                         switch (_a.label) {
                             case 0: return [4 /*yield*/, component.pages.getFirstItemByPredicate(function (x) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
                                     switch (_a.label) {
-                                        case 0: return [4 /*yield*/, x.hasAttribute(constants_1.DataVisualState.Active)];
+                                        case 0: return [4 /*yield*/, x.hasAttribute(utils_1.DataVisualState.Active)];
                                         case 1: return [2 /*return*/, _a.sent()];
                                     }
                                 }); }); })];

package/build/src/matchers/component/toHaveCountEx.js

@@ -42,13 +42,16 @@ var createAsyncMatcher_1 = require("../createAsyncMatcher");
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.toHaveCountEx = (0, createAsyncMatcher_1.createComponentAsyncMatcher)('toHaveCountEx', function (component) { return component.itemsLocator; }, function (_a, count_1, options_1) { return __awaiter(void 0, [_a, count_1, options_1], void 0, function (_b, count, options) {
     var expectation;
-    var isNot = _b.isNot, locator = _b.locator;
+    var isNot = _b.isNot, component = _b.component, locator = _b.locator;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
                 expectation = isNot ? (0, test_1.expect)(locator).not : (0, test_1.expect)(locator);
-                return [4 /*yield*/, expectation.toHaveCount(count, options)];
+                return [4 /*yield*/, component.waitFor({ state: 'attached' })];
             case 1:
+                _c.sent();
+                return [4 /*yield*/, expectation.toHaveCount(count, options)];
+            case 2:
                 _c.sent();
                 return [2 /*return*/];
         }

package/build/src/matchers/component/toHaveError.js

@@ -38,7 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toHaveError = void 0;
 var test_1 = require("@playwright/test");
-var constants_1 = require("../../utils/constants");
+var utils_1 = require("../../utils");
 var LocatorSymbols_1 = require("./LocatorSymbols");
 var createAsyncMatcher_1 = require("../createAsyncMatcher");
 exports.toHaveError = (0, createAsyncMatcher_1.createAsyncMatcher)('toHaveError', function (component) { return component[LocatorSymbols_1.toRootElementLocator](); }, function (_a, options_1) { return __awaiter(void 0, [_a, options_1], void 0, function (_b, options) {
@@ -48,7 +48,7 @@ exports.toHaveError = (0, createAsyncMatcher_1.createAsyncMatcher)('toHaveError'
         switch (_c.label) {
             case 0:
                 expectation = isNot ? (0, test_1.expect)(locator).not : (0, test_1.expect)(locator);
-                return [4 /*yield*/, expectation.toHaveAttribute(constants_1.DataVisualState.Error, options)];
+                return [4 /*yield*/, expectation.toHaveAttribute(utils_1.DataVisualState.Error, options)];
             case 1:
                 _c.sent();
                 return [2 /*return*/];

package/build/src/matchers/component/toHaveWarning.js

@@ -38,7 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toHaveWarning = void 0;
 var test_1 = require("@playwright/test");
-var constants_1 = require("../../utils/constants");
+var utils_1 = require("../../utils");
 var LocatorSymbols_1 = require("./LocatorSymbols");
 var createAsyncMatcher_1 = require("../createAsyncMatcher");
 exports.toHaveWarning = (0, createAsyncMatcher_1.createAsyncMatcher)('toHaveWarning', function (component) { return component[LocatorSymbols_1.toRootElementLocator](); }, function (_a, options_1) { return __awaiter(void 0, [_a, options_1], void 0, function (_b, options) {
@@ -48,7 +48,7 @@ exports.toHaveWarning = (0, createAsyncMatcher_1.createAsyncMatcher)('toHaveWarn
         switch (_c.label) {
             case 0:
                 expectation = isNot ? (0, test_1.expect)(locator).not : (0, test_1.expect)(locator);
-                return [4 /*yield*/, expectation.toHaveAttribute(constants_1.DataVisualState.Warning, options)];
+                return [4 /*yield*/, expectation.toHaveAttribute(utils_1.DataVisualState.Warning, options)];
             case 1:
                 _c.sent();
                 return [2 /*return*/];

package/build/src/matchers/createAsyncMatcher.js

@@ -47,8 +47,8 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createComponentAsyncMatcher = createComponentAsyncMatcher;
 exports.createAsyncMatcher = createAsyncMatcher;
-var makeMatcher_1 = require("../utils/makeMatcher");
-var toMatchMessage_1 = require("../utils/toMatchMessage");
+var utils_1 = require("../utils");
+var utils_2 = require("../utils");
 /**
  * Создает асинхронный матчер для конкретного компонента
  *
@@ -89,12 +89,12 @@ function createComponentAsyncMatcher(matcherName, getLocator, createMatcherLogic
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        _a = toMatchMessage_1.toMatchMessage;
+                        _a = utils_2.toMatchMessage;
                         _b = [this,
                             matcherName];
                         return [4 /*yield*/, getLocator(component)];
                     case 1: return [2 /*return*/, _a.apply(void 0, _b.concat([_c.sent(), function (isNot, locator) {
-                                return (0, makeMatcher_1.makeMatcher)(isNot, function () { return __awaiter(_this, void 0, void 0, function () {
+                                return (0, utils_1.makeMatcher)(isNot, function () { return __awaiter(_this, void 0, void 0, function () {
                                     return __generator(this, function (_a) {
                                         switch (_a.label) {
                                             case 0: return [4 /*yield*/, createMatcherLogicAsync.apply(void 0, __spreadArray([{ isNot: isNot, locator: locator, component: component }], args, false))];
@@ -157,12 +157,12 @@ function createAsyncMatcher(matcherName, getLocator, createMatcherLogicAsync, cr
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        _a = toMatchMessage_1.toMatchMessage;
+                        _a = utils_2.toMatchMessage;
                         _b = [this,
                             matcherName];
                         return [4 /*yield*/, getLocator(component)];
                     case 1: return [2 /*return*/, _a.apply(void 0, _b.concat([_c.sent(), function (isNot, locator) {
-                                return (0, makeMatcher_1.makeMatcher)(isNot, function () { return __awaiter(_this, void 0, void 0, function () {
+                                return (0, utils_1.makeMatcher)(isNot, function () { return __awaiter(_this, void 0, void 0, function () {
                                     return __generator(this, function (_a) {
                                         switch (_a.label) {
                                             case 0: return [4 /*yield*/, createMatcherLogicAsync.apply(void 0, __spreadArray([{ isNot: isNot, locator: locator, component: component }], args, false))];

package/build/src/utils/getMarcherResult.d.ts

@@ -1,4 +1,4 @@
-export type MatcherResult = {
+export type ErrorResult = {
     message: string;
     pass: boolean;
     actual: string;
@@ -6,7 +6,9 @@ export type MatcherResult = {
     expected: string;
     log: string[];
     stack: string;
-} | string | undefined;
+    expectError: string;
+};
+export type MatcherResult = ErrorResult | string | undefined;
 export type WithMatcherResult = {
     matcherResult: MatcherResult;
 };

package/build/src/utils/getMarcherResult.js

@@ -1,9 +1,25 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getActualFromError = void 0;
 var getActualFromError = function (e) {
+    var _a;
     if (e && typeof e === 'object' && 'matcherResult' in e && e.matcherResult) {
-        return e.matcherResult;
+        var diffLines = (_a = e.toString()) === null || _a === void 0 ? void 0 : _a.split('\n');
+        var expectError = diffLines[0].split('Error: ')[1];
+        var expectedLine = diffLines[3];
+        var receivedLine = diffLines[4];
+        return __assign(__assign({}, e.matcherResult), { expected: expectedLine, actual: receivedLine, expectError: expectError });
     }
     if (e && typeof e === 'object') {
         return e.toString();

package/build/src/utils/toMatchMessage.js

@@ -50,15 +50,15 @@ exports.toMatchMessage = toMatchMessage;
  */
 function toMatchMessage(state_1, matcherName_1, receiver_1, query_1) {
     return __awaiter(this, arguments, void 0, function (state, matcherName, receiver, query, expectedMessage, receiverType) {
-        var _a, pass, matcherResult, _b, matcherHint, printExpected, printReceived, stringify, customExpectedMessage, message;
+        var _a, pass, matcherResult, stringify, customExpectedMessage, _b, expected, expectedValue, _c, received, receivedValue, message;
         if (expectedMessage === void 0) { expectedMessage = ''; }
         if (receiverType === void 0) { receiverType = 'Locator'; }
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0: return [4 /*yield*/, query(state.isNot, receiver)];
                 case 1:
-                    _a = _c.sent(), pass = _a.matches, matcherResult = _a.matcherResult;
-                    _b = state.utils, matcherHint = _b.matcherHint, printExpected = _b.printExpected, printReceived = _b.printReceived, stringify = _b.stringify;
+                    _a = _d.sent(), pass = _a.matches, matcherResult = _a.matcherResult;
+                    stringify = state.utils.stringify;
                     if (typeof matcherResult === 'string') {
                         return [2 /*return*/, {
                                 message: function () { return matcherResult; },
@@ -68,13 +68,23 @@ function toMatchMessage(state_1, matcherName_1, receiver_1, query_1) {
                             }];
                     }
                     customExpectedMessage = expectedMessage && "Custom expected message: ".concat(stringify(expectedMessage), "\n");
+                    if (!matcherResult) {
+                        return [2 /*return*/, {
+                                message: function () { return 'Matcher result is undefined'; },
+                                pass: pass,
+                                name: matcherName,
+                                actual: undefined,
+                            }];
+                    }
+                    _b = matcherResult.expected.split(':'), expected = _b[0], expectedValue = _b[1];
+                    _c = matcherResult.actual.split(':'), received = _c[0], receivedValue = _c[1];
                     message = function () {
-                        return matcherHint(matcherName, undefined, undefined, { isNot: state.isNot }) +
+                        return "".concat(matcherResult === null || matcherResult === void 0 ? void 0 : matcherResult.expectError, "\n") +
                             '\n\n' +
                             "".concat(receiverType, ": ").concat(receiver, "\n") +
                             "".concat(customExpectedMessage) +
-                            "Expected: ".concat(printExpected(matcherResult === null || matcherResult === void 0 ? void 0 : matcherResult.expected), "\n") +
-                            "Received: ".concat(printReceived(matcherResult === null || matcherResult === void 0 ? void 0 : matcherResult.actual), "\n") +
+                            "".concat(expected, ": ").concat(getCleanValue(expectedValue), "\n") +
+                            "".concat(received, ": ").concat(getCleanValue(receivedValue), "\n") +
                             callLogText(matcherResult === null || matcherResult === void 0 ? void 0 : matcherResult.log);
                     };
                     return [2 /*return*/, { message: message, pass: pass, name: matcherName, actual: matcherResult === null || matcherResult === void 0 ? void 0 : matcherResult.actual }];
@@ -87,3 +97,8 @@ var callLogText = function (log) {
         return '';
     return "\nCall log: \n".concat(log.join('\n'), "\n");
 };
+function getCleanValue(value) {
+    if (!value)
+        return '';
+    return value.trim();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skbkontur/playwright-react-ui-components",
-  "version": "1.14.0-beta.3",
+  "version": "1.14.0-beta.4",
   "description": "Пакет для взаимодействия с компонентами @skbkontur/react-ui при тестировании с помощью Playwright",
   "main": "build/index.js",
   "files": [