@gravity-ui/playwright-tools 1.1.2 → 1.1.4-beta.114525d1176b54fc8177c759986ee94fa4516af0.0

package/actions/getTestSlug.js

@@ -9,5 +9,5 @@ function getTestSlug(page) {
     if (testSlugs_1.testSlugs.has(page)) {
         return testSlugs_1.testSlugs.get(page);
     }
-    throw new Error("Can't find slug for test");
+    throw new Error("Can't find slug for test. Probably you need to add testSlug fixture to your test config");
 }

package/actions/matchScreenshot.js

@@ -46,7 +46,7 @@ async function matchScreenshot(page, { locator = page, name = globalSettings_1.g
         await page.mouse.move(x, y);
     }
     await onBeforeScreenshot?.(page, combinedOptions);
-    const slug = (0, getTestSlug_1.getTestSlug)(page);
+    const slug = shouldPrependSlugToName ? (0, getTestSlug_1.getTestSlug)(page) : undefined;
     await page.waitForTimeout(pause);
     if (themes && themes.length) {
         for (const theme of themes) {
@@ -57,7 +57,6 @@ async function matchScreenshot(page, { locator = page, name = globalSettings_1.g
                 name: resolvedName,
                 slug,
                 options: combinedOptions,
-                shouldPrependSlugToName,
                 soft,
             });
         }
@@ -68,7 +67,6 @@ async function matchScreenshot(page, { locator = page, name = globalSettings_1.g
             name,
             slug,
             options: combinedOptions,
-            shouldPrependSlugToName,
             soft,
         });
     }
@@ -78,8 +76,8 @@ async function matchScreenshot(page, { locator = page, name = globalSettings_1.g
     }
 }
 async function doMatchScreenshot(params) {
-    const { locator, name, slug, options, shouldPrependSlugToName, soft } = params;
-    const resolvedName = resolveScreenshotName({ name, slug, shouldPrependSlugToName });
+    const { locator, name, slug, options, soft } = params;
+    const resolvedName = resolveScreenshotName({ name, slug });
     const resolvedExpect = soft ? test_1.expect.soft : test_1.expect;
     if (resolvedName) {
         await resolvedExpect(locator).toHaveScreenshot(resolvedName, options);
@@ -89,12 +87,12 @@ async function doMatchScreenshot(params) {
     }
 }
 function resolveScreenshotName(params) {
-    const { name, slug, shouldPrependSlugToName } = params;
+    const { name, slug } = params;
     if (!name) {
         return undefined;
     }
     const resolvedName = [name + '.png'];
-    if (shouldPrependSlugToName) {
+    if (slug) {
         resolvedName.unshift(slug);
     }
     return resolvedName;

package/actions/setTestSlug.d.ts

@@ -1,9 +1,8 @@
 import type { Page } from '@playwright/test';
 /**
- * Sets the test slug
+ * Sets the test slug by extracting from title or generating from title
  *
  * @param page
  * @param title The name of the test from which the slug will be extracted
- * @param required Requires the slug to be specified in a specific way in the title (otherwise the title itself will be used)
  */
-export declare function setTestSlug(page: Page, title: string, required?: boolean): void;
+export declare function setTestSlug(page: Page, title: string): void;

package/actions/setTestSlug.js

@@ -4,19 +4,17 @@ exports.setTestSlug = setTestSlug;
 const testSlugs_1 = require("../data/testSlugs");
 const extractTestSlug_1 = require("../utils/extractTestSlug");
 /**
- * Sets the test slug
+ * Sets the test slug by extracting from title or generating from title
  *
  * @param page
  * @param title The name of the test from which the slug will be extracted
- * @param required Requires the slug to be specified in a specific way in the title (otherwise the title itself will be used)
  */
-function setTestSlug(page, title, required = false) {
-    let slug = (0, extractTestSlug_1.extractTestSlug)(title, !required);
+function setTestSlug(page, title) {
+    // Try to extract slug from [slug] pattern in title
+    let slug = (0, extractTestSlug_1.extractTestSlug)(title, true);
+    // Fallback: if extraction failed, use the generated slug from title
     if (!slug) {
-        if (required) {
-            throw new Error(`Can't extract slug from title "${title}"`);
-        }
-        slug = title.replace(/<>:"\/\\\|\?\*/, '_');
+        slug = title.replace(/[<>:"/\\|?*]/g, '_');
     }
     testSlugs_1.testSlugs.set(page, slug);
 }

package/component-tests/fixtures/mount/mount-fixture.d.ts

@@ -1,3 +1,16 @@
 import type { PlaywrightTestArgs, PlaywrightTestOptions, TestFixture } from '@playwright/test';
 import type { MountFn, MountTestArgs } from './types';
+/**
+ * Enhanced mount fixture that wraps components with styling and layout controls.
+ *
+ * This fixture intercepts the base mount function to:
+ * 1. Always wrap components in a div with TEST_WRAPPER_CLASS for screenshot targeting
+ * 2. Apply padding and fit-content sizing for better visual testing
+ * 3. Disable CSS transform animations that can cause flaky screenshots
+ * 4. Support custom width and rootStyle options
+ *
+ * The wrapper is inlined using string element types ('div', 'style') because
+ * Playwright blocks function components defined in test context. See mount-wrapper.ts
+ * for more details on this restriction.
+ */
 export declare const mountFixture: TestFixture<MountFn, PlaywrightTestArgs & PlaywrightTestOptions & MountTestArgs>;

package/component-tests/fixtures/mount/mount-fixture.js

@@ -1,18 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mountFixture = void 0;
-const jsx_runtime_1 = require("react/jsx-runtime");
-const constants_1 = require("./constants");
+const mount_wrapper_1 = require("./mount-wrapper");
+/**
+ * Enhanced mount fixture that wraps components with styling and layout controls.
+ *
+ * This fixture intercepts the base mount function to:
+ * 1. Always wrap components in a div with TEST_WRAPPER_CLASS for screenshot targeting
+ * 2. Apply padding and fit-content sizing for better visual testing
+ * 3. Disable CSS transform animations that can cause flaky screenshots
+ * 4. Support custom width and rootStyle options
+ *
+ * The wrapper is inlined using string element types ('div', 'style') because
+ * Playwright blocks function components defined in test context. See mount-wrapper.ts
+ * for more details on this restriction.
+ */
 const mountFixture = async ({ mount: baseMount }, use) => {
     const mount = async (component, options) => {
-        return await baseMount((0, jsx_runtime_1.jsxs)("div", { style: {
-                padding: 20,
-                // When we set width we didn't expect that paddings for better screenshots would be included
-                boxSizing: options?.width ? 'content-box' : undefined,
-                width: options?.width ? options.width : 'fit-content',
-                height: 'fit-content',
-                ...options?.rootStyle,
-            }, className: constants_1.TEST_WRAPPER_CLASS, children: [(0, jsx_runtime_1.jsx)("style", { children: '.g-button, .g-button::after { transform: scale(1) !important; }' }), component] }), options);
+        const { width, rootStyle, ...baseMountOptions } = options || {};
+        const wrapper = (0, mount_wrapper_1.createComponentWrapper)(component, { width, rootStyle });
+        return await baseMount(wrapper, baseMountOptions);
     };
     await use(mount);
 };

package/component-tests/fixtures/mount/mount-wrapper.d.ts

@@ -0,0 +1,29 @@
+import type * as React from 'react';
+/**
+ * Playwright JSX object structure that mimics Playwright's jsx-runtime output.
+ * This is the internal structure Playwright expects when mounting components.
+ */
+type PlaywrightJsxObject<T extends keyof React.JSX.IntrinsicElements> = {
+    __pw_type: 'jsx';
+    type: T;
+    props: React.JSX.IntrinsicElements[T];
+    key: string | null;
+};
+/**
+ * Creates a wrapper around a component with styling and animation controls.
+ *
+ * This wrapper:
+ * 1. Wraps component in a div with TEST_WRAPPER_CLASS for screenshot targeting
+ * 2. Applies padding and fit-content sizing for better visual testing
+ * 3. Injects global styles to disable CSS transform animations
+ * 4. Supports custom width and rootStyle options
+ *
+ * The wrapper uses only string element types ('div', 'style') because
+ * Playwright blocks function components defined in test context.
+ * See createPlaywrightJsxObject documentation for details.
+ */
+export declare function createComponentWrapper(component: React.JSX.Element, options?: {
+    width?: number | string;
+    rootStyle?: React.CSSProperties;
+}): PlaywrightJsxObject<"div">;
+export {};

package/component-tests/fixtures/mount/mount-wrapper.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createComponentWrapper = createComponentWrapper;
+const constants_1 = require("./constants");
+/**
+ * Creates a Playwright JSX object representation.
+ *
+ * Playwright expects JSX components in a special format with __pw_type: 'jsx'.
+ * This mimics what Playwright's jsx-runtime creates when you write JSX in test files.
+ *
+ * IMPORTANT: The `type` parameter MUST be either:
+ * - A string (HTML element name like 'div', 'span', 'style')
+ * - An import reference resolved by Playwright's import registry
+ *
+ * Function references are explicitly blocked by Playwright's serializers.js:
+ * "if (value?.__pw_type === 'jsx' && typeof value.type === 'function')"
+ * This prevents components defined in test context from being mounted.
+ *
+ * That's why we use only string types (like 'div', 'style')
+ * instead of function component references.
+ *
+ * @template T - The HTML element type (e.g., 'div', 'span', 'style')
+ * @param type - HTML element name
+ * @param props - Props for the HTML element
+ * @returns A Playwright JSX object compatible with React.JSX.Element
+ */
+function createPlaywrightJsxObject(type, props) {
+    return {
+        __pw_type: 'jsx',
+        type,
+        props,
+        key: null, // Must be null (not undefined) to match React.JSX.Element type
+    };
+}
+/**
+ * Creates a wrapper around a component with styling and animation controls.
+ *
+ * This wrapper:
+ * 1. Wraps component in a div with TEST_WRAPPER_CLASS for screenshot targeting
+ * 2. Applies padding and fit-content sizing for better visual testing
+ * 3. Injects global styles to disable CSS transform animations
+ * 4. Supports custom width and rootStyle options
+ *
+ * The wrapper uses only string element types ('div', 'style') because
+ * Playwright blocks function components defined in test context.
+ * See createPlaywrightJsxObject documentation for details.
+ */
+function createComponentWrapper(component, options) {
+    const { width, rootStyle } = options || {};
+    const styleElement = createPlaywrightJsxObject('style', {
+        children: '.g-button, .g-button::after { transform: scale(1) !important; }',
+    });
+    const wrapper = createPlaywrightJsxObject('div', {
+        style: {
+            padding: 20,
+            // When width is set, padding should not affect total width
+            boxSizing: width ? 'content-box' : undefined,
+            width: width ? width : 'fit-content',
+            height: 'fit-content',
+            ...rootStyle,
+        },
+        className: constants_1.TEST_WRAPPER_CLASS,
+        children: [styleElement, component],
+    });
+    return wrapper;
+}

package/data/globalSettings.js

@@ -49,11 +49,11 @@ exports.globalSettings = {
         /**
          * Default screenshot name
          */
-        name: 'plain',
+        name: undefined,
         /**
          * Should I add a slug to the screenshot file name?
          */
-        shouldPrependSlugToName: true,
+        shouldPrependSlugToName: false,
         /**
          * Topics that require a screenshot
          * By default, screenshots are taken for the current theme. Switching does not occur

package/fixtures/expect-request/expect-request-fixture.d.ts

@@ -1,8 +1,3 @@
-import type { PlaywrightTestArgs, PlaywrightTestOptions, TestFixture } from '@playwright/test';
-import type { ExpectRequestFn } from './types';
-export declare const expectRequestFixture: TestFixture<ExpectRequestFn, PlaywrightTestOptions & PlaywrightTestArgs>;
-declare const fixtureOptions: {
-    readonly scope: "test";
-};
-export declare const expectRequest: [typeof expectRequestFixture, typeof fixtureOptions];
-export {};
+import type { Fixtures, PlaywrightTestArgs, PlaywrightTestOptions, PlaywrightWorkerArgs, PlaywrightWorkerOptions } from '@playwright/test';
+import type { ExpectRequestFixturesBuilderParams, ExpectRequestTestArgs, ExpectRequestWorkerArgs } from './types';
+export declare function expectRequestFixturesBuilder(_params?: ExpectRequestFixturesBuilderParams): Fixtures<ExpectRequestTestArgs, ExpectRequestWorkerArgs, PlaywrightTestArgs & PlaywrightTestOptions, PlaywrightWorkerArgs & PlaywrightWorkerOptions>;

package/fixtures/expect-request/expect-request-fixture.js

@@ -1,26 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.expectRequest = exports.expectRequestFixture = void 0;
+exports.expectRequestFixturesBuilder = expectRequestFixturesBuilder;
 const expect_request_1 = require("../../actions/expect-request");
-const expectRequestFixture = async ({ page, baseURL }, use) => {
-    if (!baseURL) {
-        throw new Error('Base URL required for requests matching!');
-    }
-    const requests = new Map();
-    page.on('request', (request) => {
-        const url = new URL(request.url());
-        const key = `${url.protocol}//${url.hostname}${url.pathname}`;
-        requests.set(key, request);
-    });
-    const boundExpectRequest = expect_request_1.expectRequest.bind(null, requests);
-    await use(boundExpectRequest);
-    requests.clear();
-};
-exports.expectRequestFixture = expectRequestFixture;
-const fixtureOptions = {
-    scope: 'test',
-};
-exports.expectRequest = [
-    exports.expectRequestFixture,
-    fixtureOptions,
-];
+function expectRequestFixturesBuilder(_params = {}) {
+    const expectRequestFixture = async ({ page, baseURL }, use) => {
+        if (!baseURL) {
+            throw new Error('Base URL required for requests matching!');
+        }
+        const requests = new Map();
+        page.on('request', (request) => {
+            const url = new URL(request.url());
+            const key = `${url.protocol}//${url.hostname}${url.pathname}`;
+            requests.set(key, request);
+        });
+        const boundExpectRequest = expect_request_1.expectRequest.bind(null, requests);
+        await use(boundExpectRequest);
+        requests.clear();
+    };
+    const fixtures = {
+        expectRequest: [expectRequestFixture, { scope: 'test' }],
+    };
+    return fixtures;
+}

package/fixtures/expect-request/index.d.ts

@@ -1,3 +1,3 @@
-export type { ExpectRequestFn, ExpectRequestTestArgs } from './types';
+export type { ExpectRequestFn, ExpectRequestTestArgs, ExpectRequestWorkerArgs, ExpectRequestFixturesBuilderParams, } from './types';
 export type { ExpectRequestFnMatcher, ExpectRequestFnOptions } from '../../actions/expect-request';
-export { expectRequest } from './expect-request-fixture';
+export { expectRequestFixturesBuilder } from './expect-request-fixture';

package/fixtures/expect-request/index.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.expectRequest = void 0;
+exports.expectRequestFixturesBuilder = void 0;
 var expect_request_fixture_1 = require("./expect-request-fixture");
-Object.defineProperty(exports, "expectRequest", { enumerable: true, get: function () { return expect_request_fixture_1.expectRequest; } });
+Object.defineProperty(exports, "expectRequestFixturesBuilder", { enumerable: true, get: function () { return expect_request_fixture_1.expectRequestFixturesBuilder; } });

package/fixtures/expect-request/types.d.ts

@@ -3,3 +3,5 @@ export type ExpectRequestFn = (url: string | RegExp, matcher?: ExpectRequestFnMa
 export interface ExpectRequestTestArgs {
     expectRequest: ExpectRequestFn;
 }
+export type ExpectRequestWorkerArgs = {};
+export type ExpectRequestFixturesBuilderParams = {};

package/fixtures/expect-screenshot/expect-screenshot-fixture.d.ts

@@ -1,5 +1,3 @@
-import type { PlaywrightTestArgs, PlaywrightTestOptions, TestFixture } from '@playwright/test';
-import type { ExpectScreenshotFixtureBuilderParams, ExpectScreenshotFn } from './types';
-export declare function expectScreenshotFixtureBuilder({ screenshotOptions, getDefaultMask, ...restDefaults }?: ExpectScreenshotFixtureBuilderParams): [TestFixture<ExpectScreenshotFn, PlaywrightTestArgs & PlaywrightTestOptions>, {
-    scope: "test";
-}];
+import type { Fixtures, PlaywrightTestArgs, PlaywrightTestOptions, PlaywrightWorkerArgs, PlaywrightWorkerOptions } from '@playwright/test';
+import type { ExpectScreenshotFixtureBuilderParams, ExpectScreenshotTestArgs, ExpectScreenshotWorkerArgs } from './types';
+export declare function expectScreenshotFixturesBuilder({ screenshotOptions, getDefaultMask, getDefaultLocator, ...restDefaults }?: ExpectScreenshotFixtureBuilderParams): Fixtures<ExpectScreenshotTestArgs, ExpectScreenshotWorkerArgs, PlaywrightTestArgs & PlaywrightTestOptions, PlaywrightWorkerArgs & PlaywrightWorkerOptions>;

package/fixtures/expect-screenshot/expect-screenshot-fixture.js

@@ -1,15 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.expectScreenshotFixtureBuilder = expectScreenshotFixtureBuilder;
+exports.expectScreenshotFixturesBuilder = expectScreenshotFixturesBuilder;
 const matchScreenshot_1 = require("../../actions/matchScreenshot");
-function expectScreenshotFixtureBuilder({ screenshotOptions, getDefaultMask, ...restDefaults } = {}) {
+function expectScreenshotFixturesBuilder({ screenshotOptions, getDefaultMask, getDefaultLocator, ...restDefaults } = {}) {
     const expectScreenshotFixture = async ({ page }, use) => {
-        const expectScreenshot = ({ options = {}, shouldUseDefaultMask = true, ...restParams } = {}) => {
+        const expectScreenshot = ({ options = {}, shouldUseDefaultMask = true, locator, ...restParams } = {}) => {
             const { mask = [] } = options;
             const defaultMask = shouldUseDefaultMask && getDefaultMask ? getDefaultMask(page) : [];
             const maskToUse = [...mask, ...defaultMask];
+            const locatorToUse = locator ?? getDefaultLocator?.(page);
             const mergedOptions = {
                 options: { ...screenshotOptions, ...options, mask: maskToUse },
+                locator: locatorToUse,
                 ...restDefaults,
                 ...restParams,
             };
@@ -17,12 +19,8 @@ function expectScreenshotFixtureBuilder({ screenshotOptions, getDefaultMask, ...
         };
         await use(expectScreenshot);
     };
-    const fixtureOptions = {
-        scope: 'test',
+    const fixtures = {
+        expectScreenshot: [expectScreenshotFixture, { scope: 'test' }],
     };
-    const expectScreenshot = [
-        expectScreenshotFixture,
-        fixtureOptions,
-    ];
-    return expectScreenshot;
+    return fixtures;
 }

package/fixtures/expect-screenshot/index.d.ts

@@ -1,2 +1,2 @@
-export { expectScreenshotFixtureBuilder } from './expect-screenshot-fixture';
-export type { ExpectScreenshotFixtureBuilderParams, ExpectScreenshotFn, ExpectScreenshotTestArgs, } from './types';
+export { expectScreenshotFixturesBuilder } from './expect-screenshot-fixture';
+export type { ExpectScreenshotFixtureBuilderParams, ExpectScreenshotFn, ExpectScreenshotTestArgs, ExpectScreenshotWorkerArgs, } from './types';

package/fixtures/expect-screenshot/index.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.expectScreenshotFixtureBuilder = void 0;
+exports.expectScreenshotFixturesBuilder = void 0;
 var expect_screenshot_fixture_1 = require("./expect-screenshot-fixture");
-Object.defineProperty(exports, "expectScreenshotFixtureBuilder", { enumerable: true, get: function () { return expect_screenshot_fixture_1.expectScreenshotFixtureBuilder; } });
+Object.defineProperty(exports, "expectScreenshotFixturesBuilder", { enumerable: true, get: function () { return expect_screenshot_fixture_1.expectScreenshotFixturesBuilder; } });

package/fixtures/expect-screenshot/types.d.ts

@@ -7,8 +7,10 @@ export type ExpectScreenshotOptions = MatchScreenshotOptions & {
 export type ExpectScreenshotFixtureBuilderParams = Pick<MatchScreenshotOptions, 'hideBySelector' | 'pause' | 'soft' | 'shouldPrependSlugToName' | 'themes' | 'onBeforeScreenshot' | 'onSwitchTheme'> & {
     screenshotOptions?: DefaultScreenshotOptions;
     getDefaultMask?: (page: Page) => Locator[];
+    getDefaultLocator?: (page: Page) => Locator | Page;
 };
 export type ExpectScreenshotFn = (params?: ExpectScreenshotOptions) => Promise<void>;
 export type ExpectScreenshotTestArgs = {
     expectScreenshot: ExpectScreenshotFn;
 };
+export type ExpectScreenshotWorkerArgs = {};

package/fixtures/index.d.ts

@@ -1,10 +1,10 @@
-export type { TestSlugResult } from './testSlug';
-export { testSlug } from './testSlug';
-export type { MockNetworkFixtureBuilderParams } from './mock-network';
-export { mockNetworkFixtureBuilder } from './mock-network';
-export type { ExpectRequestFn, ExpectRequestTestArgs, ExpectRequestFnMatcher, ExpectRequestFnOptions, } from './expect-request';
-export { expectRequest } from './expect-request';
-export type { ExpectScreenshotFn, ExpectScreenshotTestArgs, ExpectScreenshotFixtureBuilderParams, } from './expect-screenshot';
-export { expectScreenshotFixtureBuilder } from './expect-screenshot';
+export type { TestSlugFixturesBuilderParams, TestSlugResult, TestSlugTestArgs, TestSlugWorkerArgs, } from './test-slug';
+export { testSlugFixturesBuilder } from './test-slug';
+export type { MockNetworkFixtureBuilderParams, MockNetworkTestArgs, MockNetworkWorkerArgs, } from './mock-network';
+export { mockNetworkFixturesBuilder } from './mock-network';
+export type { ExpectRequestFn, ExpectRequestTestArgs, ExpectRequestWorkerArgs, ExpectRequestFixturesBuilderParams, ExpectRequestFnMatcher, ExpectRequestFnOptions, } from './expect-request';
+export { expectRequestFixturesBuilder } from './expect-request';
+export type { ExpectScreenshotFn, ExpectScreenshotTestArgs, ExpectScreenshotWorkerArgs, ExpectScreenshotFixtureBuilderParams, } from './expect-screenshot';
+export { expectScreenshotFixturesBuilder } from './expect-screenshot';
 export type { GlobalSettingsFixturesBuilderParams, GlobalSettingsTestArgs, GlobalSettingsWorkerArgs, } from './global-settings';
 export { globalSettingsFixturesBuilder } from './global-settings';

package/fixtures/index.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.globalSettingsFixturesBuilder = exports.expectScreenshotFixtureBuilder = exports.expectRequest = exports.mockNetworkFixtureBuilder = exports.testSlug = void 0;
-var testSlug_1 = require("./testSlug");
-Object.defineProperty(exports, "testSlug", { enumerable: true, get: function () { return testSlug_1.testSlug; } });
+exports.globalSettingsFixturesBuilder = exports.expectScreenshotFixturesBuilder = exports.expectRequestFixturesBuilder = exports.mockNetworkFixturesBuilder = exports.testSlugFixturesBuilder = void 0;
+var test_slug_1 = require("./test-slug");
+Object.defineProperty(exports, "testSlugFixturesBuilder", { enumerable: true, get: function () { return test_slug_1.testSlugFixturesBuilder; } });
 var mock_network_1 = require("./mock-network");
-Object.defineProperty(exports, "mockNetworkFixtureBuilder", { enumerable: true, get: function () { return mock_network_1.mockNetworkFixtureBuilder; } });
+Object.defineProperty(exports, "mockNetworkFixturesBuilder", { enumerable: true, get: function () { return mock_network_1.mockNetworkFixturesBuilder; } });
 var expect_request_1 = require("./expect-request");
-Object.defineProperty(exports, "expectRequest", { enumerable: true, get: function () { return expect_request_1.expectRequest; } });
+Object.defineProperty(exports, "expectRequestFixturesBuilder", { enumerable: true, get: function () { return expect_request_1.expectRequestFixturesBuilder; } });
 var expect_screenshot_1 = require("./expect-screenshot");
-Object.defineProperty(exports, "expectScreenshotFixtureBuilder", { enumerable: true, get: function () { return expect_screenshot_1.expectScreenshotFixtureBuilder; } });
+Object.defineProperty(exports, "expectScreenshotFixturesBuilder", { enumerable: true, get: function () { return expect_screenshot_1.expectScreenshotFixturesBuilder; } });
 var global_settings_1 = require("./global-settings");
 Object.defineProperty(exports, "globalSettingsFixturesBuilder", { enumerable: true, get: function () { return global_settings_1.globalSettingsFixturesBuilder; } });

package/fixtures/mock-network/index.d.ts

@@ -1,2 +1,2 @@
-export { mockNetworkFixtureBuilder } from './mock-network-fixture';
-export type { MockNetworkFixtureBuilderParams } from './types';
+export { mockNetworkFixturesBuilder } from './mock-network-fixture';
+export type { MockNetworkFixtureBuilderParams, MockNetworkTestArgs, MockNetworkWorkerArgs, } from './types';

package/fixtures/mock-network/index.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mockNetworkFixtureBuilder = void 0;
+exports.mockNetworkFixturesBuilder = void 0;
 var mock_network_fixture_1 = require("./mock-network-fixture");
-Object.defineProperty(exports, "mockNetworkFixtureBuilder", { enumerable: true, get: function () { return mock_network_fixture_1.mockNetworkFixtureBuilder; } });
+Object.defineProperty(exports, "mockNetworkFixturesBuilder", { enumerable: true, get: function () { return mock_network_fixture_1.mockNetworkFixturesBuilder; } });

package/fixtures/mock-network/mock-network-fixture.d.ts

@@ -1,6 +1,3 @@
-import type { PlaywrightTestArgs, PlaywrightTestOptions, TestFixture } from '@playwright/test';
-import type { MockNetworkFixtureBuilderParams } from './types';
-export declare function mockNetworkFixtureBuilder<TestArgs extends PlaywrightTestArgs & PlaywrightTestOptions = PlaywrightTestArgs & PlaywrightTestOptions>({ shouldUpdate, forceUpdateIfHarMissing, updateTimeout, zip, url, dumpsFilePath, optionallyEnabled, ...harPatcherParams }: MockNetworkFixtureBuilderParams): [TestFixture<boolean, TestArgs>, {
-    auto: boolean;
-    scope: "test";
-}];
+import type { Fixtures, PlaywrightTestArgs, PlaywrightTestOptions, PlaywrightWorkerArgs, PlaywrightWorkerOptions } from '@playwright/test';
+import type { MockNetworkFixtureBuilderParams, MockNetworkTestArgs, MockNetworkWorkerArgs } from './types';
+export declare function mockNetworkFixturesBuilder({ shouldUpdate, forceUpdateIfHarMissing, updateTimeout, zip, url: urlMatcherBuilder, dumpsFilePath, ...harPatcherParams }: MockNetworkFixtureBuilderParams): Fixtures<MockNetworkTestArgs, MockNetworkWorkerArgs, PlaywrightTestArgs & PlaywrightTestOptions, PlaywrightWorkerArgs & PlaywrightWorkerOptions>;

package/fixtures/mock-network/mock-network-fixture.js

@@ -1,62 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mockNetworkFixtureBuilder = mockNetworkFixtureBuilder;
+exports.mockNetworkFixturesBuilder = mockNetworkFixturesBuilder;
 const har_1 = require("../../har");
 const har_patcher_1 = require("./har-patcher");
-const fixtureFunction = async ({ baseURL: rawBaseURL, page, }, { shouldUpdate, forceUpdateIfHarMissing, updateTimeout, zip = true, url: urlMatcherBuilder, dumpsFilePath, ...harPatcherParams }, use, testInfo) => {
-    if (!rawBaseURL) {
-        throw new Error('baseURL should be specified in playwright config');
-    }
-    const baseURL = rawBaseURL.replace(/\/+$/, '');
-    (0, har_patcher_1.harPatcher)({
-        baseURL,
-        ...harPatcherParams,
-    });
-    const update = Boolean(shouldUpdate);
-    const url = urlMatcherBuilder(baseURL);
-    const finalUpdate = await (0, har_1.initDumps)(page, testInfo, {
-        dumpsFilePath,
-        forceUpdateIfHarMissing,
-        updateTimeout,
-        update,
-        url,
-        zip,
-    });
-    await use(!finalUpdate);
-};
-function mockNetworkFixtureBuilder({ shouldUpdate, forceUpdateIfHarMissing, updateTimeout, zip = true, url, dumpsFilePath, optionallyEnabled, ...harPatcherParams }) {
-    const mockNetworkFixture = async ({ baseURL, page }, use, testInfo) => {
-        return fixtureFunction({ baseURL, page }, {
-            shouldUpdate,
-            forceUpdateIfHarMissing,
-            updateTimeout,
-            zip,
-            url,
-            dumpsFilePath,
-            ...harPatcherParams,
-        }, use, testInfo);
-    };
-    const mockNetworkFixtureWithOptionalParam = async ({ baseURL, page, enableNetworkMocking }, use, testInfo) => {
+function mockNetworkFixturesBuilder({ shouldUpdate, forceUpdateIfHarMissing, updateTimeout, zip = true, url: urlMatcherBuilder, dumpsFilePath, ...harPatcherParams }) {
+    const isMockingEnabledFixture = async ({ baseURL: rawBaseURL, page, enableNetworkMocking }, use, testInfo) => {
         if (!enableNetworkMocking) {
             return use(false);
         }
-        return fixtureFunction({ baseURL, page }, {
-            shouldUpdate,
+        if (!rawBaseURL) {
+            throw new Error('baseURL should be specified in playwright config');
+        }
+        const baseURL = rawBaseURL.replace(/\/+$/, '');
+        (0, har_patcher_1.harPatcher)({
+            baseURL,
+            ...harPatcherParams,
+        });
+        const update = Boolean(shouldUpdate);
+        const url = urlMatcherBuilder(baseURL);
+        const finalUpdate = await (0, har_1.initDumps)(page, testInfo, {
+            dumpsFilePath,
             forceUpdateIfHarMissing,
             updateTimeout,
-            zip,
+            update,
             url,
-            dumpsFilePath,
-            ...harPatcherParams,
-        }, use, testInfo);
+            zip,
+        });
+        await use(!finalUpdate);
     };
-    const fixtureOptions = {
-        auto: true,
-        scope: 'test',
+    const fixtures = {
+        enableNetworkMocking: [true, { scope: 'test', option: true }],
+        isMockingEnabled: [isMockingEnabledFixture, { scope: 'test', auto: true }],
     };
-    const mockNetwork = [
-        optionallyEnabled ? mockNetworkFixtureWithOptionalParam : mockNetworkFixture,
-        fixtureOptions,
-    ];
-    return mockNetwork;
+    return fixtures;
 }

package/fixtures/mock-network/types.d.ts

@@ -77,12 +77,6 @@ export type MockNetworkFixtureBuilderParams = {
      * @param baseURL The base URL of the test
      */
     onTransformHarLookupResult?: (result: Parameters<HarLookupResultTransformFunction>[0], params: Parameters<HarLookupResultTransformFunction>[1], baseURL: string) => ReturnType<HarLookupResultTransformFunction>;
-    /**
-     * Allow optionally enable fixture.
-     * Set "enableNetworkMocking" fixture to turn on/off network mocking
-     * @defaultValue false `
-     */
-    optionallyEnabled?: boolean;
     /**
      * Flag to enable or disable adding the x-tests-duplicate-id header for identical requests
      * By default, the header is not added
@@ -90,6 +84,8 @@ export type MockNetworkFixtureBuilderParams = {
      */
     shouldMarkIdenticalRequests?: boolean;
 };
-export type OptionallyEnabledTestArgs = {
-    enableNetworkMocking?: boolean;
+export type MockNetworkTestArgs = {
+    enableNetworkMocking: boolean;
+    isMockingEnabled: boolean;
 };
+export type MockNetworkWorkerArgs = {};

package/fixtures/test-slug/index.d.ts

@@ -0,0 +1,2 @@
+export { testSlugFixturesBuilder } from './test-slug-fixture';
+export type { TestSlugFixturesBuilderParams, TestSlugResult, TestSlugTestArgs, TestSlugWorkerArgs, } from './types';

package/fixtures/test-slug/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.testSlugFixturesBuilder = void 0;
+var test_slug_fixture_1 = require("./test-slug-fixture");
+Object.defineProperty(exports, "testSlugFixturesBuilder", { enumerable: true, get: function () { return test_slug_fixture_1.testSlugFixturesBuilder; } });

package/fixtures/test-slug/test-slug-fixture.d.ts

@@ -0,0 +1,3 @@
+import type { Fixtures, PlaywrightTestArgs, PlaywrightTestOptions, PlaywrightWorkerArgs, PlaywrightWorkerOptions } from '@playwright/test';
+import type { TestSlugFixturesBuilderParams, TestSlugTestArgs, TestSlugWorkerArgs } from './types';
+export declare function testSlugFixturesBuilder(_params?: TestSlugFixturesBuilderParams): Fixtures<TestSlugTestArgs, TestSlugWorkerArgs, PlaywrightTestArgs & PlaywrightTestOptions, PlaywrightWorkerArgs & PlaywrightWorkerOptions>;

package/fixtures/test-slug/test-slug-fixture.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.testSlugFixturesBuilder = testSlugFixturesBuilder;
+const actions_1 = require("../../actions");
+function testSlugFixturesBuilder(_params = {}) {
+    const testSlugFixture = async ({ page }, use, testInfo) => {
+        (0, actions_1.setTestSlug)(page, testInfo.title);
+        const slug = (0, actions_1.getTestSlug)(page);
+        await use(slug);
+    };
+    const fixtures = {
+        testSlug: [testSlugFixture, { auto: true }],
+    };
+    return fixtures;
+}

package/fixtures/test-slug/types.d.ts

@@ -0,0 +1,6 @@
+export type TestSlugResult = string;
+export interface TestSlugTestArgs {
+    testSlug: TestSlugResult;
+}
+export type TestSlugWorkerArgs = {};
+export type TestSlugFixturesBuilderParams = {};

package/fixtures/test-slug/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/playwright-tools",
-  "version": "1.1.2",
+  "version": "1.1.4-beta.114525d1176b54fc8177c759986ee94fa4516af0.0",
   "description": "Tools for Playwright Test",
   "keywords": [
     "playwright",
@@ -100,9 +100,7 @@
   },
   "peerDependencies": {
     "@playwright/experimental-ct-react": "^1.22",
-    "@playwright/test": "^1.22",
-    "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
-    "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
+    "@playwright/test": "^1.22"
   },
   "engines": {
     "node": ">=20"

package/fixtures/testSlug.d.ts

@@ -1,12 +0,0 @@
-import type { TestFixture } from '@playwright/test';
-import type { PlaywrightTestArgsBase } from './types';
-export type TestSlugResult = string;
-declare const testSlugValue: TestFixture<TestSlugResult, PlaywrightTestArgsBase>;
-declare const fixtureOptions: {
-    auto: boolean;
-};
-/**
- * Automatically sets and adds the current slug value for the test to the test fixtures
- */
-export declare const testSlug: [typeof testSlugValue, typeof fixtureOptions];
-export {};

package/fixtures/testSlug.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.testSlug = void 0;
-const actions_1 = require("../actions");
-const testSlugValue = async ({ page }, use, testInfo) => {
-    (0, actions_1.setTestSlug)(page, testInfo.title, true);
-    const slug = (0, actions_1.getTestSlug)(page);
-    await use(slug);
-};
-const fixtureOptions = {
-    auto: true,
-};
-/**
- * Automatically sets and adds the current slug value for the test to the test fixtures
- */
-exports.testSlug = [
-    testSlugValue,
-    fixtureOptions,
-];