testplane 9.0.0-rc.4 → 9.0.1

package/build/src/browser/client-scripts/screen-shooter/tsc-out/client-scripts/screen-shooter/utils/dom.js

@@ -1,6 +1,30 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 exports.__esModule = true;
 exports.getScreenshooterNamespaceData = exports.findContainingBlock = exports.findFixedPositionedParent = exports.getParentElement = exports.forEachRoot = exports.getMainDocumentElem = exports.getOwnerIframe = exports.getOwnerWindow = void 0;
+var lib = __importStar(require("@lib"));
 var FALLBACK_SCREENSHOOTER_NAMESPACE = "__testplane_screenshooter__";
 function getOwnerWindow(node) {
     if (!node.ownerDocument) {
@@ -50,7 +74,7 @@ function getParentElement(node) {
     if (node instanceof ShadowRoot)
         return node.host;
     if (node instanceof Element) {
-        var root = node.getRootNode();
+        var root = lib.getRootNode(node);
         return node.parentElement || (root instanceof ShadowRoot ? root.host : null);
     }
     return node.parentNode instanceof Element ? node.parentNode : null;

package/build/src/browser/client-scripts/screen-shooter/tsc-out/client-scripts/shared/lib.compat.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.matchMedia = exports.getComputedStyle = exports.trim = exports.queryAll = exports.queryFirst = void 0;
+exports.matchMedia = exports.getComputedStyle = exports.getRootNode = exports.trim = exports.queryAll = exports.queryFirst = void 0;
 /// <reference types="./sizzle" />
 var sizzle_1 = __importDefault(require("sizzle"));
 var xpath = __importStar(require("./xpath"));
@@ -51,6 +51,14 @@ function trim(str) {
     return str.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, "");
 }
 exports.trim = trim;
+function getRootNode(node) {
+    var root = node;
+    while (root.parentNode) {
+        root = root.parentNode;
+    }
+    return root;
+}
+exports.getRootNode = getRootNode;
 var getComputedStyle_1 = require("./polyfills/getComputedStyle");
 __createBinding(exports, getComputedStyle_1, "getComputedStyle");
 var matchMedia_1 = require("./polyfills/matchMedia");

package/build/src/browser/client-scripts/screen-shooter/tsc-out/client-scripts/shared/lib.native.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 exports.__esModule = true;
-exports.trim = exports.matchMedia = exports.getComputedStyle = exports.queryAll = exports.queryFirst = void 0;
+exports.getRootNode = exports.trim = exports.matchMedia = exports.getComputedStyle = exports.queryAll = exports.queryFirst = void 0;
 var xpath = __importStar(require("./xpath"));
 function queryFirst(selector) {
     if (xpath.isXpathSelector(selector)) {
@@ -51,3 +51,7 @@ function trim(str) {
     return str.trim();
 }
 exports.trim = trim;
+function getRootNode(node) {
+    return node.getRootNode();
+}
+exports.getRootNode = getRootNode;

package/build/src/browser/commands/assert-view/errors/image-diff-error.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { BaseStateError } from "./base-state-error";
 import type { ImageInfo, RefImageInfo } from "../../../../types";
 import type { LooksSameOptions, LooksSameResult } from "looks-same";

package/build/src/browser/commands/assert-view/index.js

@@ -1,6 +1,7 @@
 "use strict";
 const fs = require("fs-extra");
 const path = require("path");
+const crypto = require("crypto");
 const _ = require("lodash");
 const { pngValidator: validatePng } = require("png-validator");
 const { Image } = require("../../../image");
@@ -11,9 +12,11 @@ const { getCaptureProcessors } = require("./capture-processors");
 const RuntimeConfig = require("../../../config/runtime-config");
 const AssertViewResults = require("./assert-view-results");
 const { BaseStateError } = require("./errors/base-state-error");
+const { addTestplaneSelectivityPngDependency } = require("../../cdp/selectivity/testplane-selectivity");
 const { AssertViewError } = require("./errors/assert-view-error");
 const makeDebug = require("debug");
 const debug = makeDebug("testplane:screenshots:assert-view");
+const getShortDebugId = debugId => crypto.createHash("sha1").update(debugId).digest("hex").slice(0, 7);
 const getIgnoreDiffPixelCountRatio = value => {
     const percent = _.isString(value) && value.endsWith("%") ? parseFloat(value.slice(0, -1)) : false;
     if (percent === false || _.isNaN(percent)) {
@@ -25,18 +28,8 @@ const getIgnoreDiffPixelCountRatio = value => {
     return percent / 100;
 };
 module.exports.default = browser => {
-    const { isWebdriverProtocol, shouldUsePixelRatio, needsCompatLib } = browser;
-    const browserProperties = { isWebdriverProtocol, shouldUsePixelRatio, needsCompatLib };
-    const elementsScreenShooterPromise = ElementsScreenShooter.create({
-        camera: browser.camera,
-        browser: browser.publicAPI,
-        browserProperties,
-    });
-    const viewportScreenShooterPromise = ViewportScreenShooter.create({
-        camera: browser.camera,
-        browser: browser.publicAPI,
-        browserProperties,
-    });
+    let elementsScreenShooterPromise;
+    let viewportScreenShooterPromise;
     const { publicAPI: session, config } = browser;
     const { assertViewOpts, compareOpts, compositeImage, screenshotDelay, tolerance, antialiasingTolerance, disableAnimation, } = config;
     const { handleNoRefImage, handleImageDiff, handleInvalidRefImage } = getCaptureProcessors();
@@ -47,6 +40,15 @@ module.exports.default = browser => {
         antialiasingTolerance,
         disableAnimation,
     });
+    const waitForStaticToLoad = async (opts) => {
+        if (opts.waitForStaticToLoadTimeout) {
+            // Interval between checks is "waitPageReadyTimeout / 10" ms, but at least 50ms and not more than 500ms
+            await session.waitForStaticToLoad({
+                timeout: opts.waitForStaticToLoadTimeout,
+                interval: Math.min(Math.max(50, opts.waitForStaticToLoadTimeout / 10), 500),
+            });
+        }
+    };
     const compareScreenshot = async (state, currImgInst, currImgMeta, opts) => {
         const { testplaneCtx } = session.executionContext;
         const test = session.executionContext.ctx.currentTest;
@@ -55,9 +57,9 @@ module.exports.default = browser => {
             return Promise.reject(new AssertViewError(`duplicate name for "${state}" state`));
         }
         const handleCaptureProcessorError = e => e instanceof BaseStateError ? testplaneCtx.assertViewResults.add(e) : Promise.reject(e);
-        const { tempOpts } = RuntimeConfig.getInstance();
+        const { tempOpts, updateRefs: isUpdatingRefs } = RuntimeConfig.getInstance();
         temp.attach(tempOpts);
-        const currSize = await currImgInst.getSize();
+        const currSize = currImgInst.getSize();
         const currImg = { path: temp.path(Object.assign(tempOpts, { suffix: ".png" })), size: currSize };
         const refImgAbsolutePath = config.getScreenshotPath(test, state);
         const refImgRelativePath = refImgAbsolutePath && path.relative(process.cwd(), refImgAbsolutePath);
@@ -65,8 +67,12 @@ module.exports.default = browser => {
         const { emitter } = browser;
         if (!fs.existsSync(refImg.path)) {
             await currImgInst.save(currImg.path);
+            if (isUpdatingRefs) {
+                addTestplaneSelectivityPngDependency(refImg.path);
+            }
             return handleNoRefImage(currImg, refImg, state, { emitter }).catch(e => handleCaptureProcessorError(e));
         }
+        addTestplaneSelectivityPngDependency(refImg.path);
         const { canHaveCaret, pixelRatio } = currImgMeta;
         const imageCompareOpts = {
             tolerance: opts.tolerance,
@@ -115,15 +121,26 @@ module.exports.default = browser => {
         let debugId = "debugId";
         try {
             const test = session.executionContext.ctx.currentTest;
-            debugId = `${test.fullTitle()}.${browser.id}.${state}`;
+            const fullDebugId = `${test.fullTitle()}.${browser.id}.${state}`;
+            debugId = getShortDebugId(fullDebugId);
             opts.debugId = debugId;
+            debug(`[${debugId}] assertView id: ${fullDebugId}`);
         }
         catch {
             /**/
         }
         debug(`[${debugId}] assertView selectors: %O`, selectors);
         debug(`[${debugId}] assertView opts: %O`, opts);
+        if (!elementsScreenShooterPromise) {
+            const { isWebdriverProtocol, shouldUsePixelRatio, needsCompatLib } = browser;
+            elementsScreenShooterPromise = ElementsScreenShooter.create({
+                camera: browser.camera,
+                browser: browser.publicAPI,
+                browserProperties: { isWebdriverProtocol, shouldUsePixelRatio, needsCompatLib },
+            });
+        }
         const screenShooter = await elementsScreenShooterPromise;
+        await waitForStaticToLoad(opts);
         const { image, meta } = await screenShooter.capture(selectors, opts);
         return compareScreenshot(state, image, meta, opts);
     };
@@ -154,7 +171,16 @@ module.exports.default = browser => {
     const assertViewByViewport = async (state, opts) => {
         opts = getDefaultOpts(opts);
         debug(`assertViewByViewport state: ${state}, opts: %O`, opts);
+        if (!viewportScreenShooterPromise) {
+            const { isWebdriverProtocol, shouldUsePixelRatio, needsCompatLib } = browser;
+            viewportScreenShooterPromise = ViewportScreenShooter.create({
+                camera: browser.camera,
+                browser: browser.publicAPI,
+                browserProperties: { isWebdriverProtocol, shouldUsePixelRatio, needsCompatLib },
+            });
+        }
         const vpScreenShooter = await viewportScreenShooterPromise;
+        await waitForStaticToLoad(opts);
         const { image, meta } = await vpScreenShooter.capture(opts);
         return compareScreenshot(state, image, meta, opts);
     };

package/build/src/browser/commands/assert-view/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/browser/commands/assert-view/index.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/browser/commands/assert-view/index.js"],"names":[],"mappings":"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"}

package/build/src/browser/commands/openAndWait.js

@@ -37,8 +37,7 @@ const is = {
 const makeOpenAndWaitCommand = (config, session) => async function openAndWait(uri, { selector = [], predicate, waitNetworkIdle = config.openAndWaitOpts?.waitNetworkIdle, waitNetworkIdleTimeout = config.openAndWaitOpts?.waitNetworkIdleTimeout, failOnNetworkError = config.openAndWaitOpts?.failOnNetworkError, shouldThrowError = shouldThrowErrorDefault, ignoreNetworkErrorsPatterns = config.openAndWaitOpts?.ignoreNetworkErrorsPatterns, timeout = config.openAndWaitOpts?.timeout || config?.pageLoadTimeout || 0, } = {}) {
     const PageLoader = await Promise.resolve().then(() => __importStar(require("../../utils/page-loader"))).then(m => m.default);
     const isChrome = config.desiredCapabilities?.browserName === "chrome";
-    const isCDP = config.automationProtocol === "devtools";
-    waitNetworkIdle &&= isChrome || isCDP;
+    waitNetworkIdle &&= isChrome;
     const originalPageLoadTimeout = config.pageLoadTimeout;
     const shouldUpdateTimeout = timeout && timeout !== originalPageLoadTimeout;
     const setPageLoadTimeout = async (value) => {
@@ -77,17 +76,6 @@ const makeOpenAndWaitCommand = (config, session) => async function openAndWait(u
     if (shouldUpdateTimeout) {
         await setPageLoadTimeout(timeout);
     }
-    // Create hard timeout promise to guarantee timeout is respected
-    // This is needed because WebDriver pageLoad timeout only affects the browser's
-    // page load event, not the HTTP connection/response time
-    let hardTimeoutId;
-    const hardTimeoutPromise = timeout
-        ? new Promise((_, reject) => {
-            hardTimeoutId = setTimeout(() => {
-                reject(new Error(`openAndWait timed out after ${timeout}ms`));
-            }, timeout);
-        })
-        : null;
     const loadPromise = new Promise((resolve, reject) => {
         const handleError = (err) => {
             reject(new Error(`url: ${err.message}`));
@@ -98,7 +86,27 @@ const makeOpenAndWaitCommand = (config, session) => async function openAndWait(u
             }
         };
         const goToPage = async () => {
-            await session.url(uri, { timeout });
+            const promises = [];
+            promises.push(session.url(uri, { timeout, _noFallbackOnCancel: true }).finally(() => {
+                restorePageLoadTimeout();
+            }));
+            let hardTimeoutId;
+            /* BiDi doesn't respect pageLoadTimeout, so we need to set a hard timeout and cancel previous navigation
+             * by navigating to about:blank */
+            if (session.isBidi && timeout > 0) {
+                promises.push(new Promise((_, reject) => {
+                    hardTimeoutId = setTimeout(async () => {
+                        await session.url(emptyPageUrl);
+                        reject(new Error(`openAndWait timed out after ${timeout}ms while trying to navigate to ${uri}`));
+                    }, timeout);
+                }));
+            }
+            try {
+                await Promise.race(promises);
+            }
+            finally {
+                clearTimeout(hardTimeoutId);
+            }
         };
         pageLoader.on("pageLoadError", handleError);
         pageLoader.on("selectorsError", handleError);
@@ -126,18 +134,7 @@ const makeOpenAndWaitCommand = (config, session) => async function openAndWait(u
         });
         pageLoader.load(goToPage).then(checkLoaded);
     });
-    const racePromises = [loadPromise];
-    if (hardTimeoutPromise) {
-        racePromises.push(hardTimeoutPromise);
-    }
-    return Promise.race(racePromises).finally(() => {
-        if (hardTimeoutId) {
-            clearTimeout(hardTimeoutId);
-        }
-        // No await, because session might be stuck on url() command
-        pageLoader.unsubscribe();
-        restorePageLoadTimeout();
-    });
+    return loadPromise.finally(() => pageLoader.unsubscribe());
 };
 exports.default = (browser) => {
     const { publicAPI: session, config } = browser;

package/build/src/browser/commands/openAndWait.js.map

@@ -1 +1 @@
-{"version":3,"file":"openAndWait.js","sourceRoot":"","sources":["../../../../src/browser/commands/openAndWait.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"openAndWait.js","sourceRoot":"","sources":["../../../../src/browser/commands/openAndWait.ts"],"names":[],"mappings":"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"}

package/build/src/browser/commands/restoreState/index.js

@@ -5,9 +5,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const restoreStorage_1 = require("./restoreStorage");
-const config_1 = require("../../../constants/config");
 const saveState_1 = require("../saveState");
 const existing_browser_1 = require("../../existing-browser");
+const normalizeCookiePrefixConstraints = (cookie) => {
+    if (cookie.name.startsWith("__Host-")) {
+        const cookieWithoutDomain = { ...cookie };
+        delete cookieWithoutDomain.domain;
+        return { ...cookieWithoutDomain, path: "/", secure: true };
+    }
+    if (cookie.name.startsWith("__Secure-")) {
+        return { ...cookie, secure: true };
+    }
+    return cookie;
+};
 exports.default = (browser) => {
     const { publicAPI: session } = browser;
     session.addCommand("restoreState", async (_options = {}) => {
@@ -26,11 +36,12 @@ exports.default = (browser) => {
         if (restoreState?.cookies && options.cookieFilter) {
             restoreState.cookies = restoreState?.cookies.filter(options.cookieFilter);
         }
-        switch ((0, saveState_1.getOverridesProtocol)(browser)) {
-            case config_1.WEBDRIVER_PROTOCOL: {
+        const cookies = restoreState.cookies?.map(normalizeCookiePrefixConstraints);
+        switch ((0, saveState_1.isBidiWithIsolation)(browser)) {
+            case false: {
                 await session.switchToParentFrame();
-                if (restoreState.cookies && options.cookies) {
-                    await session.setCookies(restoreState.cookies.map(cookie => ({
+                if (cookies && options.cookies) {
+                    await session.setCookies(cookies.map(cookie => ({
                         ...cookie,
                         secure: cookie.secure || cookie.sameSite === "None", // fix for ff
                         sameSite: cookie.sameSite && session.isBidi
@@ -65,14 +76,14 @@ exports.default = (browser) => {
                 }
                 break;
             }
-            case config_1.DEVTOOLS_PROTOCOL: {
+            case true: {
                 const page = await (0, existing_browser_1.getActivePuppeteerPage)(session);
                 if (!page) {
                     return;
                 }
                 const frames = page.frames();
-                if (restoreState.cookies && options.cookies) {
-                    await page.setCookie(...restoreState.cookies);
+                if (cookies && options.cookies) {
+                    await page.setCookie(...cookies);
                 }
                 for (const frame of frames) {
                     const origin = new URL(frame.url()).origin;

package/build/src/browser/commands/restoreState/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/browser/commands/restoreState/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/browser/commands/restoreState/index.ts"],"names":[],"mappings":"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"}

package/build/src/browser/commands/saveState/index.d.ts

@@ -1,5 +1,4 @@
 import { StorageData } from "./dumpStorage";
-import { DEVTOOLS_PROTOCOL, WEBDRIVER_PROTOCOL } from "../../../constants/config";
 import { ExistingBrowser } from "../../existing-browser";
 import { Cookie } from "../../../types";
 import type { Browser } from "../../types";
@@ -8,7 +7,7 @@ export type SaveStateData = {
     cookies?: Array<Cookie>;
     framesData: Record<string, FrameData>;
 };
-export declare const getOverridesProtocol: (browser: Browser) => typeof WEBDRIVER_PROTOCOL | typeof DEVTOOLS_PROTOCOL;
+export declare const isBidiWithIsolation: (browser: Browser) => boolean;
 export declare const getWebdriverFrames: (session: WebdriverIO.Browser) => Promise<string[]>;
 declare const _default: (browser: ExistingBrowser) => void;
 export default _default;

package/build/src/browser/commands/saveState/index.js

@@ -26,22 +26,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWebdriverFrames = exports.getOverridesProtocol = void 0;
+exports.getWebdriverFrames = exports.isBidiWithIsolation = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const lodash_1 = __importDefault(require("lodash"));
 const dumpStorage_1 = require("./dumpStorage");
-const config_1 = require("../../../constants/config");
 const existing_browser_1 = require("../../existing-browser");
 const logger = __importStar(require("../../../utils/logger"));
 const events_1 = require("../../../events");
 const globalFilesToRemove_1 = require("../../../globalFilesToRemove");
-// in case when we use webdriver protocol, bidi and isolation
-// we have to force change protocol to devtools, for use puppeteer,
-// because we use it for create incognito window
-const getOverridesProtocol = (browser) => browser.config.automationProtocol === config_1.WEBDRIVER_PROTOCOL && browser.publicAPI.isBidi && browser.config.isolation
-    ? config_1.DEVTOOLS_PROTOCOL
-    : browser.config.automationProtocol;
-exports.getOverridesProtocol = getOverridesProtocol;
+// in case when we use bidi and isolation
+// we have to use puppeteer, because we use it for creating incognito window
+const isBidiWithIsolation = (browser) => browser.publicAPI.isBidi && browser.config.isolation;
+exports.isBidiWithIsolation = isBidiWithIsolation;
 const getWebdriverFrames = async (session) => session.execute(() => Array.from(document.getElementsByTagName("iframe"))
     .map(el => el.getAttribute("src"))
     .filter(src => src !== null && src !== "about:blank"));
@@ -57,8 +53,8 @@ exports.default = (browser) => {
         const data = {
             framesData: {},
         };
-        switch ((0, exports.getOverridesProtocol)(browser)) {
-            case config_1.WEBDRIVER_PROTOCOL: {
+        switch ((0, exports.isBidiWithIsolation)(browser)) {
+            case false: {
                 if (options.cookies) {
                     const cookies = await session.getAllCookies();
                     data.cookies = cookies.map(cookie => ({
@@ -97,7 +93,7 @@ exports.default = (browser) => {
                 data.framesData = framesData;
                 break;
             }
-            case config_1.DEVTOOLS_PROTOCOL: {
+            case true: {
                 if (options.cookies) {
                     const cookies = await session.getAllCookies();
                     data.cookies = cookies.map(cookie => ({

package/build/src/browser/commands/saveState/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/browser/commands/saveState/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/browser/commands/saveState/index.ts"],"names":[],"mappings":"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"}

package/build/src/browser/commands/switchToRepl.js

@@ -36,15 +36,33 @@ const logger = __importStar(require("../../utils/logger"));
 const REPL_LINE_EVENT = "line";
 exports.default = (browser) => {
     const { publicAPI: session } = browser;
-    const applyContext = (replServer, ctx = {}) => {
-        if (!ctx.browser) {
-            ctx.browser = session;
+    const getContextDescriptors = (contexts) => {
+        const descriptors = {};
+        for (const context of contexts) {
+            if (!context) {
+                continue;
+            }
+            Object.assign(descriptors, Object.getOwnPropertyDescriptors(context));
         }
-        for (const [key, value] of Object.entries(ctx)) {
-            Object.defineProperty(replServer.context, key, {
+        if (!Object.prototype.hasOwnProperty.call(descriptors, "browser")) {
+            descriptors.browser = {
+                value: session,
+            };
+        }
+        return descriptors;
+    };
+    const applyContext = (replServer, contexts) => {
+        for (const [key, descriptor] of Object.entries(getContextDescriptors(contexts))) {
+            const replDescriptor = {
+                ...descriptor,
                 configurable: false,
                 enumerable: true,
-                value,
+            };
+            if ("value" in replDescriptor) {
+                replDescriptor.writable = false;
+            }
+            Object.defineProperty(replServer.context, key, {
+                ...replDescriptor,
             });
         }
     };
@@ -64,7 +82,7 @@ exports.default = (browser) => {
             s.write(message);
         }
     };
-    session.addCommand("switchToRepl", async function (ctx = {}) {
+    session.addCommand("switchToRepl", async function (...contexts) {
         const runtimeCfg = runtime_config_1.default.getInstance();
         const { onReplMode } = browser.state;
         if (!runtimeCfg.replMode || !runtimeCfg.replMode.enabled) {
@@ -78,6 +96,7 @@ exports.default = (browser) => {
         const currCwd = process.cwd();
         const testCwd = node_path_1.default.dirname(session.executionContext.ctx.currentTest.file);
         process.chdir(testCwd);
+        browser.applyState({ onReplMode: true });
         let allSockets = [];
         const input = new node_stream_1.Readable({ read() { } });
         const output = new node_stream_1.Writable({
@@ -103,9 +122,8 @@ exports.default = (browser) => {
             broadcastMessage(data.toString(), allSockets);
             input.push(data);
         });
-        browser.applyState({ onReplMode: true });
         runtimeCfg.extend({ replServer });
-        applyContext(replServer, ctx);
+        applyContext(replServer, contexts);
         handleLines(replServer);
         return new Promise(resolve => {
             return replServer.on("exit", () => {

package/build/src/browser/commands/switchToRepl.js.map

@@ -1 +1 @@
-{"version":3,"file":"switchToRepl.js","sourceRoot":"","sources":["../../../../src/browser/commands/switchToRepl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"switchToRepl.js","sourceRoot":"","sources":["../../../../src/browser/commands/switchToRepl.ts"],"names":[],"mappings":"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"}