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

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

@@ -1,5 +1,4 @@
 export { getTooltip } from './tooltipProvider';
 export * from './constants';
 export * from './toMatchMessage';
-export * from './getMarcherResult';
 export * from './makeMatcher';

package/build/src/utils/index.js

@@ -19,5 +19,4 @@ var tooltipProvider_1 = require("./tooltipProvider");
 Object.defineProperty(exports, "getTooltip", { enumerable: true, get: function () { return tooltipProvider_1.getTooltip; } });
 __exportStar(require("./constants"), exports);
 __exportStar(require("./toMatchMessage"), exports);
-__exportStar(require("./getMarcherResult"), exports);
 __exportStar(require("./makeMatcher"), exports);

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

@@ -1,5 +1,4 @@
-import type { MatcherResult } from './getMarcherResult';
 export declare const makeMatcher: (isNot: boolean, matcher: () => Promise<void>) => Promise<{
     matches: boolean;
-    matcherResult: MatcherResult | undefined;
+    matcherResult: string | undefined;
 }>;

package/build/src/utils/makeMatcher.js

@@ -37,7 +37,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeMatcher = void 0;
-var getMarcherResult_1 = require("./getMarcherResult");
 var makeMatcher = function (isNot, matcher) { return __awaiter(void 0, void 0, void 0, function () {
     var pass, matcherResult, e_1;
     return __generator(this, function (_a) {
@@ -51,7 +50,9 @@ var makeMatcher = function (isNot, matcher) { return __awaiter(void 0, void 0, v
                 return [3 /*break*/, 3];
             case 2:
                 e_1 = _a.sent();
-                matcherResult = (0, getMarcherResult_1.getActualFromError)(e_1);
+                if (e_1 && typeof e_1 === 'object') {
+                    matcherResult = e_1.toString().replace('Error: ', '');
+                }
                 pass = false;
                 return [3 /*break*/, 3];
             case 3:

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

@@ -1,8 +1,7 @@
 import type { ExpectMatcherState, Locator } from '@playwright/test';
-import type { MatcherResult } from './getMarcherResult';
 export type MatchQueryType = (isNot: boolean, locator: Locator) => Promise<{
     matches: boolean;
-    matcherResult?: MatcherResult;
+    matcherResult?: string;
 }>;
 /**
  * Создает сообщение для ожидания
@@ -15,7 +14,7 @@ export type MatchQueryType = (isNot: boolean, locator: Locator) => Promise<{
  * @param expectedMessage - сообщение для ожидания
  * @param receiverType - тип локатора
  */
-export declare function toMatchMessage(state: ExpectMatcherState, matcherName: string, receiver: Locator, query: MatchQueryType, expectedMessage?: string | RegExp, receiverType?: string): Promise<{
+export declare function toMatchMessage(state: ExpectMatcherState, matcherName: string, receiver: Locator, query: MatchQueryType, expectedMessage?: string | RegExp): Promise<{
     message: () => string;
     pass: boolean;
     name: string;

package/build/src/utils/toMatchMessage.js

@@ -37,6 +37,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toMatchMessage = toMatchMessage;
+var formattedMessage = function () {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    return "".concat(args.filter(Boolean).join('\n\n'));
+};
 /**
  * Создает сообщение для ожидания
  *
@@ -49,56 +56,31 @@ exports.toMatchMessage = toMatchMessage;
  * @param receiverType - тип локатора
  */
 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, stringify, customExpectedMessage, _b, expected, expectedValue, _c, received, receivedValue, message;
+    return __awaiter(this, arguments, void 0, function (state, matcherName, receiver, query, expectedMessage) {
+        var _a, pass, matcherResult, stringify, customMessage;
         if (expectedMessage === void 0) { expectedMessage = ''; }
-        if (receiverType === void 0) { receiverType = 'Locator'; }
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0: return [4 /*yield*/, query(state.isNot, receiver)];
                 case 1:
-                    _a = _d.sent(), pass = _a.matches, matcherResult = _a.matcherResult;
+                    _a = _b.sent(), pass = _a.matches, matcherResult = _a.matcherResult;
                     stringify = state.utils.stringify;
+                    customMessage = expectedMessage && "Custom message: ".concat(stringify(expectedMessage), "\n");
                     if (typeof matcherResult === 'string') {
                         return [2 /*return*/, {
-                                message: function () { return matcherResult; },
+                                message: function () { return formattedMessage(matcherResult, customMessage); },
                                 pass: pass,
                                 name: matcherName,
                                 actual: matcherResult,
                             }];
                     }
-                    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 "".concat(matcherResult === null || matcherResult === void 0 ? void 0 : matcherResult.expectError, "\n") +
-                            '\n\n' +
-                            "".concat(receiverType, ": ").concat(receiver, "\n") +
-                            "".concat(customExpectedMessage) +
-                            "".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 }];
+                    return [2 /*return*/, {
+                            message: function () { return formattedMessage('Matcher result is undefined', customMessage); },
+                            pass: pass,
+                            name: matcherName,
+                            actual: undefined,
+                        }];
             }
         });
     });
 }
-var callLogText = function (log) {
-    if (!log || !log.some(function (l) { return !!l; }))
-        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.4",
+  "version": "1.14.0-rc.1",
   "description": "Пакет для взаимодействия с компонентами @skbkontur/react-ui при тестировании с помощью Playwright",
   "main": "build/index.js",
   "files": [

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

@@ -1,15 +0,0 @@
-export type ErrorResult = {
-    message: string;
-    pass: boolean;
-    actual: string;
-    name: string;
-    expected: string;
-    log: string[];
-    stack: string;
-    expectError: string;
-};
-export type MatcherResult = ErrorResult | string | undefined;
-export type WithMatcherResult = {
-    matcherResult: MatcherResult;
-};
-export declare const getActualFromError: (e: unknown) => MatcherResult;

package/build/src/utils/getMarcherResult.js

@@ -1,29 +0,0 @@
-"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) {
-        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();
-    }
-    return undefined;
-};
-exports.getActualFromError = getActualFromError;