@skbkontur/playwright-react-ui-components 1.18.0-beta.2 → 1.18.0-beta.3

package/build/src/assertions/CurrencyLabelAssertions.js

@@ -52,20 +52,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CurrencyLabelAssertions = void 0;
-var CurrencyHelper_1 = require("@skbkontur/react-ui/components/CurrencyInput/CurrencyHelper");
 var extensions_1 = require("../extensions");
 var BaseComponentAssertions_1 = require("./BaseComponentAssertions");
-/**
- * Если `assertionOptions` не определен или в нем нет такого `key` - берем значение из `baseOptions`
- * Иначе берем значение `key` из `assertionOptions`
- */
-function pickOption(baseOptions, assertionOptions, key) {
-    var _a;
-    if (assertionOptions === undefined || !(key in assertionOptions)) {
-        return (_a = baseOptions[key]) !== null && _a !== void 0 ? _a : undefined;
-    }
-    return assertionOptions[key];
-}
+var currencyLabel_1 = require("../utils/currencyLabel");
 var CurrencyLabelAssertions = /** @class */ (function (_super) {
     __extends(CurrencyLabelAssertions, _super);
     function CurrencyLabelAssertions(currencyLabel) {
@@ -75,19 +64,13 @@ var CurrencyLabelAssertions = /** @class */ (function (_super) {
     }
     CurrencyLabelAssertions.prototype.toHaveValue = function (value, assertionOptions) {
         return __awaiter(this, void 0, void 0, function () {
-            var baseOptions, format, formattedValue, text;
+            var baseOptions, text;
             var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         baseOptions = (_a = this.currencyLabel.options) !== null && _a !== void 0 ? _a : {};
-                        format = {
-                            currencySymbol: pickOption(baseOptions, assertionOptions, 'currencySymbol'),
-                            fractionDigits: pickOption(baseOptions, assertionOptions, 'fractionDigits'),
-                            hideTrailingZeros: pickOption(baseOptions, assertionOptions, 'hideTrailingZeros'),
-                        };
-                        formattedValue = typeof value === 'number' ? CurrencyHelper_1.CurrencyHelper.format(value, format) : CurrencyHelper_1.CurrencyHelper.formatString(value, format);
-                        text = format.currencySymbol ? "".concat(formattedValue, "\u00A0").concat(format.currencySymbol) : formattedValue;
+                        text = (0, currencyLabel_1.getCurrencyLabelExpectedText)(value, baseOptions, assertionOptions);
                         return [4 /*yield*/, (0, extensions_1.expect)(this.currencyLabel.rootLocator).toHaveText(text, {
                                 timeout: assertionOptions === null || assertionOptions === void 0 ? void 0 : assertionOptions.timeout,
                             })];

package/build/src/components/CurrencyLabel.d.ts

@@ -3,6 +3,7 @@ import { BaseComponent } from './BaseComponent';
 import { CurrencyLabelAssertions } from '../assertions';
 import { type TooltipType } from '../utils';
 import type { GetAttributeOptions, InnerTextOptions } from '../options';
+import { toValueElementLocator } from '../matchers/component/LocatorSymbols';
 export type CurrencyLabelOptions = {
     /** Символ валюты */
     currencySymbol?: string;
@@ -14,6 +15,7 @@ export type CurrencyLabelOptions = {
 export declare class CurrencyLabel extends BaseComponent {
     readonly rootLocator: Locator;
     readonly options: CurrencyLabelOptions;
+    readonly [toValueElementLocator]: () => Locator;
     constructor(rootLocator: Locator, options?: CurrencyLabelOptions);
     isDisabled(options?: GetAttributeOptions): Promise<boolean>;
     getText(options?: InnerTextOptions): Promise<string>;

package/build/src/components/CurrencyLabel.js

@@ -50,11 +50,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CurrencyLabel = void 0;
 var BaseComponent_1 = require("./BaseComponent");
 var assertions_1 = require("../assertions");
 var utils_1 = require("../utils");
+var LocatorSymbols_1 = require("../matchers/component/LocatorSymbols");
 var CurrencyLabel = /** @class */ (function (_super) {
     __extends(CurrencyLabel, _super);
     function CurrencyLabel(rootLocator, options) {
@@ -62,14 +64,15 @@ var CurrencyLabel = /** @class */ (function (_super) {
         var _this = _super.call(this, rootLocator) || this;
         _this.rootLocator = rootLocator;
         _this.options = options;
+        _this[_a] = function () { return _this.rootLocator; };
         return _this;
     }
     CurrencyLabel.prototype.isDisabled = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0: return [4 /*yield*/, this.getAttribute(utils_1.DataVisualState.Disabled, options)];
-                    case 1: return [2 /*return*/, (_a.sent()) !== null];
+                    case 1: return [2 /*return*/, (_b.sent()) !== null];
                 }
             });
         });
@@ -86,3 +89,4 @@ var CurrencyLabel = /** @class */ (function (_super) {
     return CurrencyLabel;
 }(BaseComponent_1.BaseComponent));
 exports.CurrencyLabel = CurrencyLabel;
+_a = LocatorSymbols_1.toValueElementLocator;

package/build/src/matchers/component/toHaveValue.d.ts

@@ -1,6 +1,6 @@
-import type { ValueOptions } from '../../options';
+import type { CurrencyLabelAssertionOptions, ValueOptions } from '../../options';
 import type { ToWithValueElementLocator } from './LocatorSymbols';
 export declare const toHaveValue: (this: import("@playwright/test").ExpectMatcherState, component: ToWithValueElementLocator, args_0: string | number | RegExp | readonly (string | RegExp)[] | {
     start?: string;
     end?: string;
-}, args_1?: ValueOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
+}, args_1?: ValueOptions | CurrencyLabelAssertionOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;

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

@@ -40,6 +40,7 @@ exports.toHaveValue = void 0;
 var test_1 = require("@playwright/test");
 var components_1 = require("../../components");
 var extensions_1 = require("../../extensions");
+var currencyLabel_1 = require("../../utils/currencyLabel");
 var LocatorSymbols_1 = require("./LocatorSymbols");
 var createAsyncMatcher_1 = require("../createAsyncMatcher");
 exports.toHaveValue = (0, createAsyncMatcher_1.createSymbolMatcher)('toHaveValue', LocatorSymbols_1.toValueElementLocator, function (_a, expected_1, options_1) { return __awaiter(void 0, [_a, expected_1, options_1], void 0, function (_b, expected, options) {
@@ -53,31 +54,36 @@ exports.toHaveValue = (0, createAsyncMatcher_1.createSymbolMatcher)('toHaveValue
                 switch (_c) {
                     case component instanceof components_1.Select: return [3 /*break*/, 1];
                     case component instanceof components_1.CurrencyInput: return [3 /*break*/, 3];
-                    case component instanceof components_1.ComboBox: return [3 /*break*/, 5];
-                    case component instanceof components_1.DateRangePicker: return [3 /*break*/, 7];
+                    case component instanceof components_1.CurrencyLabel: return [3 /*break*/, 5];
+                    case component instanceof components_1.ComboBox: return [3 /*break*/, 7];
+                    case component instanceof components_1.DateRangePicker: return [3 /*break*/, 9];
                 }
-                return [3 /*break*/, 9];
+                return [3 /*break*/, 11];
             case 1: return [4 /*yield*/, checkSelect(isNot, locator, expected, options)];
             case 2:
                 _d.sent();
-                return [3 /*break*/, 11];
+                return [3 /*break*/, 13];
             case 3: return [4 /*yield*/, checkCurrencyInput(component, isNot, locator, expected, options)];
             case 4:
                 _d.sent();
-                return [3 /*break*/, 11];
-            case 5: return [4 /*yield*/, checkComboBox(component, isNot, locator, expected, options)];
+                return [3 /*break*/, 13];
+            case 5: return [4 /*yield*/, checkCurrencyLabel(component, isNot, locator, expected, options)];
             case 6:
                 _d.sent();
-                return [3 /*break*/, 11];
-            case 7: return [4 /*yield*/, checkDateRangePicker(component, expected)];
+                return [3 /*break*/, 13];
+            case 7: return [4 /*yield*/, checkComboBox(component, isNot, locator, expected, options)];
             case 8:
                 _d.sent();
-                return [3 /*break*/, 11];
-            case 9: return [4 /*yield*/, expectation.toHaveValue(expected, options)];
+                return [3 /*break*/, 13];
+            case 9: return [4 /*yield*/, checkDateRangePicker(component, expected)];
             case 10:
                 _d.sent();
-                _d.label = 11;
-            case 11: return [2 /*return*/];
+                return [3 /*break*/, 13];
+            case 11: return [4 /*yield*/, expectation.toHaveValue(expected, options)];
+            case 12:
+                _d.sent();
+                _d.label = 13;
+            case 13: return [2 /*return*/];
         }
     });
 }); });
@@ -96,6 +102,22 @@ function checkSelect(isNot, locator, expected, options) {
         });
     });
 }
+function checkCurrencyLabel(component, isNot, locator, expectedValue, options) {
+    return __awaiter(this, void 0, void 0, function () {
+        var expectation, expectedText;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    expectation = isNot ? (0, test_1.expect)(locator).not : (0, test_1.expect)(locator);
+                    expectedText = (0, currencyLabel_1.getCurrencyLabelExpectedText)(expectedValue, component.options, options);
+                    return [4 /*yield*/, expectation.toHaveText(expectedText, { timeout: options === null || options === void 0 ? void 0 : options.timeout })];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
 function checkCurrencyInput(component, isNot, locator, expectedValue, options) {
     return __awaiter(this, void 0, void 0, function () {
         var expectation, expectation_1;

package/build/src/matchers/componentMatchers.d.ts

@@ -20,7 +20,7 @@ declare const matchers: {
     readonly toHaveValue: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").ToWithValueElementLocator, args_0: string | number | RegExp | readonly (string | RegExp)[] | {
         start?: string;
         end?: string;
-    }, args_1?: import("..").ValueOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
+    }, args_1?: import("..").ValueOptions | import("..").CurrencyLabelAssertionOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
     readonly toHaveText: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").ToTextElementLocator, args_0: string | RegExp | readonly (string | RegExp)[], args_1?: import("..").TextOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
     readonly toHaveCount: (this: import("@playwright/test").ExpectMatcherState, component: import("..").ComponentList<any>, args_0: number, args_1?: import("..").CountOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
     readonly toHaveHref: (this: import("@playwright/test").ExpectMatcherState, component: import("..").Link, args_0: string | RegExp, args_1?: import("..").AttributeOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
@@ -95,7 +95,7 @@ declare const matchers: {
     readonly toHaveValueEx: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").ToWithValueElementLocator, args_0: string | number | RegExp | readonly (string | RegExp)[] | {
         start?: string;
         end?: string;
-    }, args_1?: import("..").ValueOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
+    }, args_1?: import("..").ValueOptions | import("..").CurrencyLabelAssertionOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
     /**
      * @deprecated will be removed in the next major version
      * @see {@link toHaveText}
@@ -150,7 +150,7 @@ export declare const componentMatchers: import("@playwright/test").Expect<{
     readonly toHaveValue: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").ToWithValueElementLocator, args_0: string | number | RegExp | readonly (string | RegExp)[] | {
         start?: string;
         end?: string;
-    }, args_1?: import("..").ValueOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
+    }, args_1?: import("..").ValueOptions | import("..").CurrencyLabelAssertionOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
     readonly toHaveText: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").ToTextElementLocator, args_0: string | RegExp | readonly (string | RegExp)[], args_1?: import("..").TextOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
     readonly toHaveCount: (this: import("@playwright/test").ExpectMatcherState, component: import("..").ComponentList<any>, args_0: number, args_1?: import("..").CountOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
     readonly toHaveHref: (this: import("@playwright/test").ExpectMatcherState, component: import("..").Link, args_0: string | RegExp, args_1?: import("..").AttributeOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
@@ -225,7 +225,7 @@ export declare const componentMatchers: import("@playwright/test").Expect<{
     readonly toHaveValueEx: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").ToWithValueElementLocator, args_0: string | number | RegExp | readonly (string | RegExp)[] | {
         start?: string;
         end?: string;
-    }, args_1?: import("..").ValueOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
+    }, args_1?: import("..").ValueOptions | import("..").CurrencyLabelAssertionOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
     /**
      * @deprecated will be removed in the next major version
      * @see {@link toHaveText}

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

@@ -0,0 +1,3 @@
+import type { CurrencyLabelOptions } from '../components/CurrencyLabel';
+import type { CurrencyLabelAssertionOptions } from '../options';
+export declare function getCurrencyLabelExpectedText(value: string | number, baseOptions: CurrencyLabelOptions, assertionOptions?: CurrencyLabelAssertionOptions): string;

package/build/src/utils/currencyLabel.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCurrencyLabelExpectedText = getCurrencyLabelExpectedText;
+var CurrencyHelper_1 = require("@skbkontur/react-ui/components/CurrencyInput/CurrencyHelper");
+/**
+ * Если `assertionOptions` не определен или в нем нет такого `key` - берем значение из `baseOptions`
+ * Иначе берем значение `key` из `assertionOptions`
+ */
+function pickOption(baseOptions, assertionOptions, key) {
+    var _a;
+    if (assertionOptions === undefined || !(key in assertionOptions)) {
+        return (_a = baseOptions[key]) !== null && _a !== void 0 ? _a : undefined;
+    }
+    return assertionOptions[key];
+}
+function getCurrencyLabelExpectedText(value, baseOptions, assertionOptions) {
+    var format = {
+        currencySymbol: pickOption(baseOptions, assertionOptions, 'currencySymbol'),
+        fractionDigits: pickOption(baseOptions, assertionOptions, 'fractionDigits'),
+        hideTrailingZeros: pickOption(baseOptions, assertionOptions, 'hideTrailingZeros'),
+    };
+    var formattedValue = typeof value === 'number' ? CurrencyHelper_1.CurrencyHelper.format(value, format) : CurrencyHelper_1.CurrencyHelper.formatString(value, format);
+    return format.currencySymbol ? "".concat(formattedValue, "\u00A0").concat(format.currencySymbol) : formattedValue;
+}

package/package.json

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