testplane 8.29.7-alpha.0 → 8.30.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/package.json +1 -2
- package/build/src/browser/browser.d.ts +1 -3
- package/build/src/browser/browser.js.map +1 -1
- package/build/src/browser/commands/assert-view/errors/base-state-error.d.ts +1 -1
- package/build/src/browser/commands/assert-view/errors/image-diff-error.d.ts +1 -1
- package/build/src/browser/commands/assert-view/errors/image-diff-error.js +2 -24
- package/build/src/browser/commands/assert-view/errors/image-diff-error.js.map +1 -1
- package/build/src/browser/commands/moveCursorTo.d.ts +1 -1
- package/build/src/browser/commands/openAndWait.d.ts +2 -2
- package/build/src/browser/commands/openAndWait.js +3 -26
- package/build/src/browser/commands/openAndWait.js.map +1 -1
- package/build/src/browser/commands/runStep.d.ts +1 -1
- package/build/src/browser/commands/switchToRepl.js +2 -1
- package/build/src/browser/commands/switchToRepl.js.map +1 -1
- package/build/src/browser/commands/types.d.ts +2 -2
- package/build/src/browser/existing-browser.js +3 -4
- package/build/src/browser/existing-browser.js.map +1 -1
- package/build/src/browser/history/callstack.d.ts +0 -1
- package/build/src/browser/history/callstack.js +2 -5
- package/build/src/browser/history/callstack.js.map +1 -1
- package/build/src/browser/new-browser.d.ts +0 -1
- package/build/src/browser/new-browser.js +17 -53
- package/build/src/browser/new-browser.js.map +1 -1
- package/build/src/browser/types.d.ts +5 -5
- package/build/src/browser/types.js +5 -4
- package/build/src/browser/types.js.map +1 -1
- package/build/src/browser-installer/chrome/index.js +1 -6
- package/build/src/browser-installer/chrome/index.js.map +1 -1
- package/build/src/browser-installer/constants.d.ts +0 -1
- package/build/src/browser-installer/constants.js +1 -2
- package/build/src/browser-installer/constants.js.map +1 -1
- package/build/src/browser-installer/edge/index.js +1 -6
- package/build/src/browser-installer/edge/index.js.map +1 -1
- package/build/src/browser-installer/firefox/index.js +1 -6
- package/build/src/browser-installer/firefox/index.js.map +1 -1
- package/build/src/browser-installer/safari/index.js +1 -6
- package/build/src/browser-installer/safari/index.js.map +1 -1
- package/build/src/browser-pool/basic-pool.d.ts +1 -1
- package/build/src/browser-pool/basic-pool.js +2 -25
- package/build/src/browser-pool/basic-pool.js.map +1 -1
- package/build/src/browser-pool/webdriver-pool.js +3 -27
- package/build/src/browser-pool/webdriver-pool.js.map +1 -1
- package/build/src/cli/commands/install-deps/index.d.ts +1 -1
- package/build/src/cli/commands/install-deps/index.js +8 -8
- package/build/src/cli/commands/install-deps/index.js.map +1 -1
- package/build/src/config/defaults.d.ts +1 -0
- package/build/src/config/defaults.js +1 -0
- package/build/src/config/defaults.js.map +1 -1
- package/build/src/config/options.js +1 -0
- package/build/src/config/options.js.map +1 -1
- package/build/src/config/types.d.ts +2 -1
- package/build/src/dev-server/index.js +15 -3
- package/build/src/dev-server/index.js.map +1 -1
- package/build/src/dev-server/utils.d.ts +1 -0
- package/build/src/dev-server/utils.js +37 -23
- package/build/src/dev-server/utils.js.map +1 -1
- package/build/src/runner/browser-env/vite/browser-modules/tsconfig.tsbuildinfo +1 -1
- package/build/src/test-reader/controllers/also-controller.d.ts +1 -1
- package/build/src/test-reader/controllers/also-controller.js.map +1 -1
- package/build/src/test-reader/controllers/browser-version-controller.d.ts +1 -1
- package/build/src/test-reader/controllers/config-controller.d.ts +1 -1
- package/build/src/test-reader/controllers/config-controller.js.map +1 -1
- package/build/src/test-reader/controllers/only-controller.d.ts +1 -1
- package/build/src/test-reader/controllers/skip-controller.d.ts +1 -1
- package/build/src/test-reader/controllers/skip-controller.js.map +1 -1
- package/build/src/test-reader/index.d.ts +3 -3
- package/build/src/test-reader/sets-builder/index.d.ts +1 -1
- package/build/src/test-reader/sets-builder/index.js +5 -6
- package/build/src/test-reader/sets-builder/index.js.map +1 -1
- package/build/src/test-reader/sets-builder/set-collection.d.ts +1 -1
- package/build/src/test-reader/sets-builder/test-set.d.ts +2 -2
- package/build/src/test-reader/sets-builder/test-set.js +3 -2
- package/build/src/test-reader/sets-builder/test-set.js.map +1 -1
- package/build/src/test-reader/test-parser.js +4 -6
- package/build/src/test-reader/test-parser.js.map +1 -1
- package/build/src/testplane.d.ts +2 -2
- package/build/src/testplane.js +6 -9
- package/build/src/testplane.js.map +1 -1
- package/build/src/utils/processor.d.ts +2 -2
- package/build/src/utils/processor.js +2 -13
- package/build/src/utils/processor.js.map +1 -1
- package/build/src/utils/workers-registry.js +2 -3
- package/build/src/utils/workers-registry.js.map +1 -1
- package/build/src/worker/browser-env/runner/test-runner/index.d.ts +1 -2
- package/build/src/worker/browser-env/runner/test-runner/index.js +2 -5
- package/build/src/worker/browser-env/runner/test-runner/index.js.map +1 -1
- package/build/src/worker/runner/index.js +7 -32
- package/build/src/worker/runner/index.js.map +1 -1
- package/build/src/worker/runner/test-runner/index.d.ts +9 -8
- package/build/src/worker/runner/test-runner/index.js +10 -30
- package/build/src/worker/runner/test-runner/index.js.map +1 -1
- package/package.json +1 -2
- package/build/src/browser/third-party-grid.d.ts +0 -13
- package/build/src/browser/third-party-grid.js +0 -114
- package/build/src/browser/third-party-grid.js.map +0 -1
- package/build/src/utils/preload-utils.d.ts +0 -4
- package/build/src/utils/preload-utils.js +0 -21
- package/build/src/utils/preload-utils.js.map +0 -1
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BrowserName = void 0;
|
|
4
|
+
const browsers_1 = require("@puppeteer/browsers");
|
|
4
5
|
exports.BrowserName = {
|
|
5
|
-
CHROME:
|
|
6
|
-
CHROMIUM:
|
|
7
|
-
CHROMEHEADLESSSHELL:
|
|
8
|
-
FIREFOX:
|
|
6
|
+
CHROME: browsers_1.Browser.CHROME,
|
|
7
|
+
CHROMIUM: browsers_1.Browser.CHROMIUM,
|
|
8
|
+
CHROMEHEADLESSSHELL: browsers_1.Browser.CHROMEHEADLESSSHELL,
|
|
9
|
+
FIREFOX: browsers_1.Browser.FIREFOX,
|
|
9
10
|
SAFARI: "safari",
|
|
10
11
|
EDGE: "MicrosoftEdge",
|
|
11
12
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/browser/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/browser/types.ts"],"names":[],"mappings":";;;AAAA,kDAAkE;AAWrD,QAAA,WAAW,GAAG;IACvB,MAAM,EAAE,kBAAgB,CAAC,MAAM;IAC/B,QAAQ,EAAE,kBAAgB,CAAC,QAAQ;IACnC,mBAAmB,EAAE,kBAAgB,CAAC,mBAAmB;IACzD,OAAO,EAAE,kBAAgB,CAAC,OAAO;IACjC,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,eAAe;CACf,CAAC"}
|
|
@@ -34,12 +34,7 @@ const runChromeDriver = async (chromeVersion, { debug = false } = {}) => {
|
|
|
34
34
|
}
|
|
35
35
|
const gridUrl = `http://127.0.0.1:${randomPort}`;
|
|
36
36
|
process.once("exit", () => chromeDriver.kill());
|
|
37
|
-
await (0, wait_port_1.default)({
|
|
38
|
-
port: randomPort,
|
|
39
|
-
output: "silent",
|
|
40
|
-
timeout: constants_1.DRIVER_WAIT_TIMEOUT,
|
|
41
|
-
interval: constants_1.DRIVER_WAIT_INTERVAL,
|
|
42
|
-
});
|
|
37
|
+
await (0, wait_port_1.default)({ port: randomPort, output: "silent", timeout: constants_1.DRIVER_WAIT_TIMEOUT });
|
|
43
38
|
return { gridUrl, process: chromeDriver, port: randomPort };
|
|
44
39
|
};
|
|
45
40
|
exports.runChromeDriver = runChromeDriver;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/browser-installer/chrome/index.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAyD;AACzD,wDAA+B;AAC/B,0DAAiC;AACjC,kDAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/browser-installer/chrome/index.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAyD;AACzD,wDAA+B;AAC/B,0DAAiC;AACjC,kDAA4D;AAC5D,4CAAmD;AACnD,oCAAwC;AACxC,uCAAsE;AAI7D,8FAJA,uBAAa,OAIA;AAAE,2GAJA,oCAA0B,OAIA;AAHlD,qCAA+C;AAGK,oGAH3C,4BAAmB,OAG2C;AAFvE,wDAAkE;AAI3D,MAAM,eAAe,GAAG,KAAK,EAChC,aAAqB,EACrB,EAAE,KAAK,GAAG,KAAK,EAAE,GAAG,EAAE,EAC2C,EAAE;IACnE,MAAM,CAAC,gBAAgB,EAAE,UAAU,EAAE,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACtE,IAAA,4BAAmB,EAAC,aAAa,CAAC;QAClC,IAAA,kBAAO,GAAE;QACT,IAAA,0BAAQ,GAAE;aACL,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,oCAAkB,GAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;aAC1D,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;KACpF,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,IAAA,qBAAK,EAAC,gBAAgB,EAAE,CAAC,UAAU,UAAU,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE;QACrG,WAAW,EAAE,IAAI;QACjB,QAAQ,EAAE,KAAK;QACf,GAAG,EAAE,eAAe;KACvB,CAAC,CAAC;IAEH,IAAI,KAAK,EAAE,CAAC;QACR,IAAA,0BAAkB,EAAC,YAAY,EAAE,iBAAiB,IAAA,oBAAY,EAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACvF,CAAC;IAED,MAAM,OAAO,GAAG,oBAAoB,UAAU,EAAE,CAAC;IAEjD,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;IAEhD,MAAM,IAAA,mBAAQ,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,+BAAmB,EAAE,CAAC,CAAC;IAErF,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;AAChE,CAAC,CAAC;AA7BW,QAAA,eAAe,mBA6B1B"}
|
|
@@ -13,7 +13,6 @@ export declare const MIN_CHROMIUM_MAC_ARM_VERSION = 93;
|
|
|
13
13
|
export declare const MIN_CHROMIUM_VERSION = 73;
|
|
14
14
|
export declare const MIN_FIREFOX_VERSION = 60;
|
|
15
15
|
export declare const MIN_EDGEDRIVER_VERSION = 94;
|
|
16
|
-
export declare const DRIVER_WAIT_INTERVAL = 25;
|
|
17
16
|
export declare const DRIVER_WAIT_TIMEOUT: number;
|
|
18
17
|
export declare const LINUX_UBUNTU_RELEASE_ID = "ubuntu";
|
|
19
18
|
export declare const LINUX_RUNTIME_LIBRARIES_PATH_ENV_NAME = "LD_LIBRARY_PATH";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.MANDATORY_UBUNTU_PACKAGES_TO_BE_INSTALLED = exports.LINUX_RUNTIME_LIBRARIES_PATH_ENV_NAME = exports.LINUX_UBUNTU_RELEASE_ID = exports.DRIVER_WAIT_TIMEOUT = exports.
|
|
3
|
+
exports.MANDATORY_UBUNTU_PACKAGES_TO_BE_INSTALLED = exports.LINUX_RUNTIME_LIBRARIES_PATH_ENV_NAME = exports.LINUX_UBUNTU_RELEASE_ID = exports.DRIVER_WAIT_TIMEOUT = exports.MIN_EDGEDRIVER_VERSION = exports.MIN_FIREFOX_VERSION = exports.MIN_CHROMIUM_VERSION = exports.MIN_CHROMIUM_MAC_ARM_VERSION = exports.MIN_CHROMEDRIVER_MAC_ARM_NEW_ARCHIVE_NAME = exports.MIN_CHROMEDRIVER_FOR_TESTING_VERSION = exports.MIN_CHROME_FOR_TESTING_VERSION = exports.SAFARIDRIVER_PATH = exports.MSEDGEDRIVER_API = exports.FIREFOX_VERSIONS_LATEST_VERSIONS_API_URL = exports.FIREFOX_VERSIONS_ALL_VERSIONS_API_URL = exports.GECKODRIVER_CARGO_TOML = exports.CHROME_FOR_TESTING_LATEST_STABLE_API_URL = exports.CHROME_FOR_TESTING_MILESTONES_API_URL = exports.CHROMEDRIVER_STORAGE_API = void 0;
|
|
4
4
|
exports.CHROMEDRIVER_STORAGE_API = "https://chromedriver.storage.googleapis.com";
|
|
5
5
|
const CHROME_FOR_TESTING_VERSIONS_API_URL = "https://googlechromelabs.github.io/chrome-for-testing";
|
|
6
6
|
exports.CHROME_FOR_TESTING_MILESTONES_API_URL = `${CHROME_FOR_TESTING_VERSIONS_API_URL}/latest-versions-per-milestone.json`;
|
|
@@ -18,7 +18,6 @@ exports.MIN_CHROMIUM_MAC_ARM_VERSION = 93;
|
|
|
18
18
|
exports.MIN_CHROMIUM_VERSION = 73;
|
|
19
19
|
exports.MIN_FIREFOX_VERSION = 60;
|
|
20
20
|
exports.MIN_EDGEDRIVER_VERSION = 94;
|
|
21
|
-
exports.DRIVER_WAIT_INTERVAL = 25; // 20ms
|
|
22
21
|
exports.DRIVER_WAIT_TIMEOUT = 10 * 1000; // 10s
|
|
23
22
|
exports.LINUX_UBUNTU_RELEASE_ID = "ubuntu";
|
|
24
23
|
exports.LINUX_RUNTIME_LIBRARIES_PATH_ENV_NAME = "LD_LIBRARY_PATH";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/browser-installer/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,wBAAwB,GAAG,6CAA6C,CAAC;AAEtF,MAAM,mCAAmC,GAAG,uDAAuD,CAAC;AACvF,QAAA,qCAAqC,GAAG,GAAG,mCAAmC,qCAAqC,CAAC;AACpH,QAAA,wCAAwC,GAAG,GAAG,mCAAmC,wBAAwB,CAAC;AAE1G,QAAA,sBAAsB,GAAG,0EAA0E,CAAC;AAEjH,MAAM,iCAAiC,GAAG,yCAAyC,CAAC;AACvE,QAAA,qCAAqC,GAAG,GAAG,iCAAiC,eAAe,CAAC;AAC5F,QAAA,wCAAwC,GAAG,GAAG,iCAAiC,wBAAwB,CAAC;AAExG,QAAA,gBAAgB,GAAG,oCAAoC,CAAC;AAExD,QAAA,iBAAiB,GAAG,uBAAuB,CAAC;AAC5C,QAAA,8BAA8B,GAAG,GAAG,CAAC;AACrC,QAAA,oCAAoC,GAAG,GAAG,CAAC;AAC3C,QAAA,yCAAyC,GAAG,GAAG,CAAC;AAChD,QAAA,4BAA4B,GAAG,EAAE,CAAC;AAClC,QAAA,oBAAoB,GAAG,EAAE,CAAC;AAC1B,QAAA,mBAAmB,GAAG,EAAE,CAAC;AACzB,QAAA,sBAAsB,GAAG,EAAE,CAAC;AAC5B,QAAA,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/browser-installer/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,wBAAwB,GAAG,6CAA6C,CAAC;AAEtF,MAAM,mCAAmC,GAAG,uDAAuD,CAAC;AACvF,QAAA,qCAAqC,GAAG,GAAG,mCAAmC,qCAAqC,CAAC;AACpH,QAAA,wCAAwC,GAAG,GAAG,mCAAmC,wBAAwB,CAAC;AAE1G,QAAA,sBAAsB,GAAG,0EAA0E,CAAC;AAEjH,MAAM,iCAAiC,GAAG,yCAAyC,CAAC;AACvE,QAAA,qCAAqC,GAAG,GAAG,iCAAiC,eAAe,CAAC;AAC5F,QAAA,wCAAwC,GAAG,GAAG,iCAAiC,wBAAwB,CAAC;AAExG,QAAA,gBAAgB,GAAG,oCAAoC,CAAC;AAExD,QAAA,iBAAiB,GAAG,uBAAuB,CAAC;AAC5C,QAAA,8BAA8B,GAAG,GAAG,CAAC;AACrC,QAAA,oCAAoC,GAAG,GAAG,CAAC;AAC3C,QAAA,yCAAyC,GAAG,GAAG,CAAC;AAChD,QAAA,4BAA4B,GAAG,EAAE,CAAC;AAClC,QAAA,oBAAoB,GAAG,EAAE,CAAC;AAC1B,QAAA,mBAAmB,GAAG,EAAE,CAAC;AACzB,QAAA,sBAAsB,GAAG,EAAE,CAAC;AAC5B,QAAA,mBAAmB,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,MAAM;AACvC,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,qCAAqC,GAAG,iBAAiB,CAAC;AAC1D,QAAA,yCAAyC,GAAG,CAAC,YAAY,CAAC,CAAC"}
|
|
@@ -24,12 +24,7 @@ const runEdgeDriver = async (edgeVersion, { debug = false } = {}) => {
|
|
|
24
24
|
}
|
|
25
25
|
const gridUrl = `http://127.0.0.1:${randomPort}`;
|
|
26
26
|
process.once("exit", () => edgeDriver.kill());
|
|
27
|
-
await (0, wait_port_1.default)({
|
|
28
|
-
port: randomPort,
|
|
29
|
-
output: "silent",
|
|
30
|
-
timeout: constants_1.DRIVER_WAIT_TIMEOUT,
|
|
31
|
-
interval: constants_1.DRIVER_WAIT_INTERVAL,
|
|
32
|
-
});
|
|
27
|
+
await (0, wait_port_1.default)({ port: randomPort, output: "silent", timeout: constants_1.DRIVER_WAIT_TIMEOUT });
|
|
33
28
|
return { gridUrl, process: edgeDriver, port: randomPort };
|
|
34
29
|
};
|
|
35
30
|
exports.runEdgeDriver = runEdgeDriver;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/browser-installer/edge/index.ts"],"names":[],"mappings":";;;;;;AAAA,qCAA6C;AAQpC,kGARA,0BAAiB,OAQA;AAP1B,iDAAyD;AACzD,wDAA+B;AAC/B,0DAAiC;AACjC,kDAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/browser-installer/edge/index.ts"],"names":[],"mappings":";;;;;;AAAA,qCAA6C;AAQpC,kGARA,0BAAiB,OAQA;AAP1B,iDAAyD;AACzD,wDAA+B;AAC/B,0DAAiC;AACjC,kDAA4D;AAC5D,4CAAmD;AAEnD,qCAA+C;AAAtC,6GAAA,kBAAkB,OAAA;AAGpB,MAAM,aAAa,GAAG,KAAK,EAC9B,WAAmB,EACnB,EAAE,KAAK,GAAG,KAAK,KAA0B,EAAE,EACsB,EAAE;IACnE,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAA,0BAAiB,EAAC,WAAW,CAAC,EAAE,IAAA,kBAAO,GAAE,CAAC,CAAC,CAAC;IAEpG,MAAM,UAAU,GAAG,IAAA,qBAAK,EAAC,cAAc,EAAE,CAAC,UAAU,UAAU,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE;QACjG,WAAW,EAAE,IAAI;QACjB,QAAQ,EAAE,KAAK;KAClB,CAAC,CAAC;IAEH,IAAI,KAAK,EAAE,CAAC;QACR,IAAA,0BAAkB,EAAC,UAAU,EAAE,eAAe,WAAW,IAAI,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,OAAO,GAAG,oBAAoB,UAAU,EAAE,CAAC;IAEjD,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;IAE9C,MAAM,IAAA,mBAAQ,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,+BAAmB,EAAE,CAAC,CAAC;IAErF,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;AAC9D,CAAC,CAAC;AAtBW,QAAA,aAAa,iBAsBxB"}
|
|
@@ -38,12 +38,7 @@ const runGeckoDriver = async (firefoxVersion, { debug = false } = {}) => {
|
|
|
38
38
|
}
|
|
39
39
|
const gridUrl = `http://127.0.0.1:${randomPort}`;
|
|
40
40
|
process.once("exit", () => geckoDriver.kill());
|
|
41
|
-
await (0, wait_port_1.default)({
|
|
42
|
-
port: randomPort,
|
|
43
|
-
output: "silent",
|
|
44
|
-
timeout: constants_1.DRIVER_WAIT_TIMEOUT,
|
|
45
|
-
interval: constants_1.DRIVER_WAIT_INTERVAL,
|
|
46
|
-
});
|
|
41
|
+
await (0, wait_port_1.default)({ port: randomPort, output: "silent", timeout: constants_1.DRIVER_WAIT_TIMEOUT });
|
|
47
42
|
return { gridUrl, process: geckoDriver, port: randomPort };
|
|
48
43
|
};
|
|
49
44
|
exports.runGeckoDriver = runGeckoDriver;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/browser-installer/firefox/index.ts"],"names":[],"mappings":";;;;;;AACA,6CAAwD;AACxD,wDAA+B;AAC/B,0DAAiC;AACjC,uCAAwE;AAM/D,+FANA,wBAAc,OAMA;AAAE,4GANA,qCAA2B,OAMA;AALpD,qCAAoD;AAKE,yGAL7C,iCAAwB,OAK6C;AAJ9E,kDAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/browser-installer/firefox/index.ts"],"names":[],"mappings":";;;;;;AACA,6CAAwD;AACxD,wDAA+B;AAC/B,0DAAiC;AACjC,uCAAwE;AAM/D,+FANA,wBAAc,OAMA;AAAE,4GANA,qCAA2B,OAMA;AALpD,qCAAoD;AAKE,yGAL7C,iCAAwB,OAK6C;AAJ9E,kDAA4D;AAC5D,4CAAmD;AACnD,wDAAkE;AAI3D,MAAM,cAAc,GAAG,KAAK,EAC/B,cAAsB,EACtB,EAAE,KAAK,GAAG,KAAK,EAAE,GAAG,EAAE,EAC2C,EAAE;IACnE,MAAM,CAAC,eAAe,EAAE,UAAU,EAAE,cAAc,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACpE,IAAA,iCAAwB,EAAC,cAAc,CAAC;QACxC,IAAA,kBAAO,GAAE;QACT,IAAA,0BAAQ,GAAE;aACL,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,oCAAkB,GAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;aAC1D,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;KACpF,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,MAAM,IAAA,mBAAgB,EAAC;QACvC,qBAAqB,EAAE,eAAe;QACtC,IAAI,EAAE,UAAU;QAChB,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO;QAC9B,SAAS,EAAE;YACP,WAAW,EAAE,IAAI;YACjB,QAAQ,EAAE,KAAK;YACf,GAAG,EAAE,cAAc;SACtB;KACJ,CAAC,CAAC;IAEH,IAAI,KAAK,EAAE,CAAC;QACR,IAAA,0BAAkB,EAAC,WAAW,EAAE,gBAAgB,cAAc,IAAI,CAAC,CAAC;IACxE,CAAC;IAED,MAAM,OAAO,GAAG,oBAAoB,UAAU,EAAE,CAAC;IAEjD,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;IAE/C,MAAM,IAAA,mBAAQ,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,+BAAmB,EAAE,CAAC,CAAC;IAErF,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;AAC/D,CAAC,CAAC;AAlCW,QAAA,cAAc,kBAkCzB"}
|
|
@@ -22,12 +22,7 @@ const runSafariDriver = async ({ debug = false } = {}) => {
|
|
|
22
22
|
}
|
|
23
23
|
const gridUrl = `http://127.0.0.1:${randomPort}`;
|
|
24
24
|
process.once("exit", () => safariDriver.kill());
|
|
25
|
-
await (0, wait_port_1.default)({
|
|
26
|
-
port: randomPort,
|
|
27
|
-
output: "silent",
|
|
28
|
-
timeout: constants_1.DRIVER_WAIT_TIMEOUT,
|
|
29
|
-
interval: constants_1.DRIVER_WAIT_INTERVAL,
|
|
30
|
-
});
|
|
25
|
+
await (0, wait_port_1.default)({ port: randomPort, output: "silent", timeout: constants_1.DRIVER_WAIT_TIMEOUT });
|
|
31
26
|
return { gridUrl, process: safariDriver, port: randomPort };
|
|
32
27
|
};
|
|
33
28
|
exports.runSafariDriver = runSafariDriver;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/browser-installer/safari/index.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAyD;AACzD,wDAA+B;AAC/B,0DAAiC;AACjC,kDAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/browser-installer/safari/index.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAyD;AACzD,wDAA+B;AAC/B,0DAAiC;AACjC,kDAA4D;AAC5D,4CAAsE;AAEtE,qCAAiD;AAAxC,+GAAA,oBAAoB,OAAA;AAEtB,MAAM,eAAe,GAAG,KAAK,EAAE,EAAE,KAAK,GAAG,KAAK,KAA0B,EAAE,EAI9E,EAAE;IACD,MAAM,UAAU,GAAG,MAAM,IAAA,kBAAO,GAAE,CAAC;IAEnC,MAAM,YAAY,GAAG,IAAA,qBAAK,EAAC,6BAAiB,EAAE,CAAC,UAAU,UAAU,EAAE,CAAC,EAAE;QACpE,WAAW,EAAE,IAAI;QACjB,QAAQ,EAAE,KAAK;KAClB,CAAC,CAAC;IAEH,IAAI,KAAK,EAAE,CAAC;QACR,IAAA,0BAAkB,EAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,OAAO,GAAG,oBAAoB,UAAU,EAAE,CAAC;IAEjD,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;IAEhD,MAAM,IAAA,mBAAQ,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,+BAAmB,EAAE,CAAC,CAAC;IAErF,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;AAChE,CAAC,CAAC;AAvBW,QAAA,eAAe,mBAuB1B"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import debug from "debug";
|
|
2
|
-
import
|
|
2
|
+
import { NewBrowser } from "../browser/new-browser";
|
|
3
3
|
import { AsyncEmitter } from "../events";
|
|
4
4
|
import { BrowserOpts, Pool } from "./types";
|
|
5
5
|
import { Config } from "../config";
|
|
@@ -1,27 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
4
|
};
|
|
@@ -29,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
29
6
|
exports.BasicPool = void 0;
|
|
30
7
|
const debug_1 = __importDefault(require("debug"));
|
|
31
8
|
const lodash_1 = __importDefault(require("lodash"));
|
|
9
|
+
const new_browser_1 = require("../browser/new-browser");
|
|
32
10
|
const cancelled_error_1 = require("./cancelled-error");
|
|
33
11
|
const events_1 = require("../events");
|
|
34
12
|
const webdriver_pool_1 = require("./webdriver-pool");
|
|
@@ -45,8 +23,7 @@ class BasicPool {
|
|
|
45
23
|
this._wdPool = new webdriver_pool_1.WebdriverPool();
|
|
46
24
|
}
|
|
47
25
|
async getBrowser(id, opts = {}) {
|
|
48
|
-
const
|
|
49
|
-
const browser = NewBrowser.create(this._config, { ...opts, id, wdPool: this._wdPool, emitter: this._emitter });
|
|
26
|
+
const browser = new_browser_1.NewBrowser.create(this._config, { ...opts, id, wdPool: this._wdPool, emitter: this._emitter });
|
|
50
27
|
try {
|
|
51
28
|
await browser.init();
|
|
52
29
|
this.log(`browser ${browser.fullId} started`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basic-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/basic-pool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"basic-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/basic-pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,29 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
3
|
exports.WebdriverPool = void 0;
|
|
4
|
+
const browser_installer_1 = require("../browser-installer");
|
|
27
5
|
const browser_1 = require("../utils/browser");
|
|
28
6
|
class WebdriverPool {
|
|
29
7
|
constructor() {
|
|
@@ -38,8 +16,7 @@ class WebdriverPool {
|
|
|
38
16
|
`Supported browsers: "chrome", "firefox", "safari", "MicrosoftEdge"`,
|
|
39
17
|
].join("\n"));
|
|
40
18
|
}
|
|
41
|
-
const
|
|
42
|
-
const browserVersionNormalized = browserVersion || (await resolveBrowserVersion(browserNameNormalized));
|
|
19
|
+
const browserVersionNormalized = browserVersion || (await (0, browser_installer_1.resolveBrowserVersion)(browserNameNormalized));
|
|
43
20
|
const wdProcesses = this.driverProcess.get(browserNameNormalized)?.get(browserVersionNormalized) ?? {};
|
|
44
21
|
for (const port in wdProcesses) {
|
|
45
22
|
if (!wdProcesses[port].isBusy) {
|
|
@@ -69,8 +46,7 @@ class WebdriverPool {
|
|
|
69
46
|
}
|
|
70
47
|
}
|
|
71
48
|
async createWebdriverProcess(browserName, browserVersion, { debug = false } = {}) {
|
|
72
|
-
const
|
|
73
|
-
const driver = await runBrowserDriver(browserName, browserVersion, { debug });
|
|
49
|
+
const driver = await (0, browser_installer_1.runBrowserDriver)(browserName, browserVersion, { debug });
|
|
74
50
|
if (!this.driverProcess.has(browserName)) {
|
|
75
51
|
this.driverProcess.set(browserName, new Map());
|
|
76
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webdriver-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/webdriver-pool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"webdriver-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/webdriver-pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { Testplane } from "../../../testplane";
|
|
2
2
|
export declare const registerCmd: (cliTool: typeof commander, testplane: Testplane) => void;
|
|
@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
26
26
|
exports.registerCmd = void 0;
|
|
27
27
|
const constants_1 = require("../../constants");
|
|
28
28
|
const logger = __importStar(require("../../../utils/logger"));
|
|
29
|
+
const browser_installer_1 = require("../../../browser-installer");
|
|
29
30
|
const { INSTALL_DEPS: commandName } = constants_1.CliCommands;
|
|
30
31
|
const logResult = (browsersInstallPerStatus, logType, status, heading, formatLine) => {
|
|
31
32
|
if (!browsersInstallPerStatus[status].length) {
|
|
@@ -40,7 +41,6 @@ const registerCmd = (cliTool, testplane) => {
|
|
|
40
41
|
.option("-c, --config <path>", "path to configuration file")
|
|
41
42
|
.arguments("[browsers...]")
|
|
42
43
|
.action(async (browsers) => {
|
|
43
|
-
const { installBrowsersWithDrivers, BrowserInstallStatus } = await Promise.resolve().then(() => __importStar(require("../../../browser-installer")));
|
|
44
44
|
try {
|
|
45
45
|
if (!browsers.length) {
|
|
46
46
|
browsers = Object.keys(testplane.config.browsers);
|
|
@@ -62,12 +62,12 @@ const registerCmd = (cliTool, testplane) => {
|
|
|
62
62
|
].join("\n"));
|
|
63
63
|
}
|
|
64
64
|
});
|
|
65
|
-
const browsersInstallResult = await installBrowsersWithDrivers(browsersToInstall);
|
|
65
|
+
const browsersInstallResult = await (0, browser_installer_1.installBrowsersWithDrivers)(browsersToInstall);
|
|
66
66
|
const browserTags = Object.keys(browsersInstallResult);
|
|
67
67
|
const browsersInstallPerStatus = {
|
|
68
|
-
[BrowserInstallStatus.Ok]: [],
|
|
69
|
-
[BrowserInstallStatus.Skip]: [],
|
|
70
|
-
[BrowserInstallStatus.Error]: [],
|
|
68
|
+
[browser_installer_1.BrowserInstallStatus.Ok]: [],
|
|
69
|
+
[browser_installer_1.BrowserInstallStatus.Skip]: [],
|
|
70
|
+
[browser_installer_1.BrowserInstallStatus.Error]: [],
|
|
71
71
|
};
|
|
72
72
|
for (const tag of browserTags) {
|
|
73
73
|
const result = browsersInstallResult[tag];
|
|
@@ -79,9 +79,9 @@ const registerCmd = (cliTool, testplane) => {
|
|
|
79
79
|
bucket.push({ tag });
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
|
-
logResult(browsersInstallPerStatus, "log", BrowserInstallStatus.Ok, "These browsers are downloaded successfully:", ({ tag }) => `- ${tag}`);
|
|
83
|
-
logResult(browsersInstallPerStatus, "warn", BrowserInstallStatus.Skip, "Browser install for these browsers was skipped:", ({ tag, reason }) => `- ${tag}: ${reason}`);
|
|
84
|
-
logResult(browsersInstallPerStatus, "error", BrowserInstallStatus.Error, "An error occured while trying to download these browsers:", ({ tag, reason }) => `- ${tag}: ${reason}`);
|
|
82
|
+
logResult(browsersInstallPerStatus, "log", browser_installer_1.BrowserInstallStatus.Ok, "These browsers are downloaded successfully:", ({ tag }) => `- ${tag}`);
|
|
83
|
+
logResult(browsersInstallPerStatus, "warn", browser_installer_1.BrowserInstallStatus.Skip, "Browser install for these browsers was skipped:", ({ tag, reason }) => `- ${tag}: ${reason}`);
|
|
84
|
+
logResult(browsersInstallPerStatus, "error", browser_installer_1.BrowserInstallStatus.Error, "An error occured while trying to download these browsers:", ({ tag, reason }) => `- ${tag}: ${reason}`);
|
|
85
85
|
}
|
|
86
86
|
catch (err) {
|
|
87
87
|
logger.error(err.stack || err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/cli/commands/install-deps/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAA8C;AAC9C,8DAAgD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/cli/commands/install-deps/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../../src/config/defaults.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../../src/config/defaults.js"],"names":[],"mappings":"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"}
|
|
@@ -129,6 +129,7 @@ const rootSection = section(_.extend(browserOptions.getTopLevel(), {
|
|
|
129
129
|
args: options.optionalArray("devServer.args"),
|
|
130
130
|
cwd: options.optionalString("devServer.cwd"),
|
|
131
131
|
logs: options.optionalBoolean("devServer.logs"),
|
|
132
|
+
reuseExisting: options.optionalBoolean("devServer.reuseExisting"),
|
|
132
133
|
readinessProbe: option({
|
|
133
134
|
defaultValue: defaults.devServer.readinessProbe,
|
|
134
135
|
validate: value => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../src/config/options.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../src/config/options.js"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import type { BrowserConfig } from "./browser-config";
|
|
|
4
4
|
import type { BrowserTestRunEnvOptions } from "../runner/browser-env/vite/types";
|
|
5
5
|
import type { Test } from "../types";
|
|
6
6
|
import type { ChildProcessWithoutNullStreams } from "child_process";
|
|
7
|
-
import
|
|
7
|
+
import { RequestOptions } from "https";
|
|
8
8
|
export interface CompareOptsConfig {
|
|
9
9
|
shouldCluster: boolean;
|
|
10
10
|
clustersSize: number;
|
|
@@ -304,6 +304,7 @@ export interface CommonConfig {
|
|
|
304
304
|
args: Array<string>;
|
|
305
305
|
logs: boolean;
|
|
306
306
|
readinessProbe: ReadinessProbe;
|
|
307
|
+
reuseExisting: boolean;
|
|
307
308
|
};
|
|
308
309
|
timeTravel: TimeTravelConfig;
|
|
309
310
|
}
|
|
@@ -36,6 +36,16 @@ const initDevServer = async ({ testplane, devServerConfig, configPath }) => {
|
|
|
36
36
|
if (!devServerConfig || !devServerConfig.command) {
|
|
37
37
|
return;
|
|
38
38
|
}
|
|
39
|
+
if (devServerConfig.reuseExisting) {
|
|
40
|
+
if (typeof devServerConfig.readinessProbe === "function" || !devServerConfig.readinessProbe.url) {
|
|
41
|
+
throw new Error("When 'reuseExisting' option is set in 'devServer' config, it is required to set 'devServer.readinessProbe.url' option");
|
|
42
|
+
}
|
|
43
|
+
const isReady = await (0, utils_1.probeServer)(devServerConfig.readinessProbe);
|
|
44
|
+
if (isReady) {
|
|
45
|
+
logger.log("Reusing existing dev server");
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
39
49
|
logger.log("Starting dev server with command", `"${devServerConfig.command}"`);
|
|
40
50
|
const debugLog = (0, debug_1.default)("testplane:dev-server");
|
|
41
51
|
if (!lodash_1.default.isEmpty(devServerConfig.args)) {
|
|
@@ -53,7 +63,12 @@ const initDevServer = async ({ testplane, devServerConfig, configPath }) => {
|
|
|
53
63
|
if (devServerConfig.logs) {
|
|
54
64
|
(0, utils_1.pipeLogsWithPrefix)(devServer, "[dev server] ");
|
|
55
65
|
}
|
|
66
|
+
const killDevServerOnProcessExitCb = () => {
|
|
67
|
+
devServer.kill("SIGINT");
|
|
68
|
+
};
|
|
69
|
+
process.on("exit", killDevServerOnProcessExitCb);
|
|
56
70
|
devServer.once("exit", (code, signal) => {
|
|
71
|
+
process.removeListener("exit", killDevServerOnProcessExitCb);
|
|
57
72
|
if (signal !== "SIGINT") {
|
|
58
73
|
const errorMessage = [
|
|
59
74
|
"An error occured while launching dev server",
|
|
@@ -62,9 +77,6 @@ const initDevServer = async ({ testplane, devServerConfig, configPath }) => {
|
|
|
62
77
|
testplane.halt(new Error(errorMessage), 5000);
|
|
63
78
|
}
|
|
64
79
|
});
|
|
65
|
-
process.once("exit", () => {
|
|
66
|
-
devServer.kill("SIGINT");
|
|
67
|
-
});
|
|
68
80
|
await (0, utils_1.waitDevServerReady)(devServer, devServerConfig.readinessProbe);
|
|
69
81
|
};
|
|
70
82
|
exports.initDevServer = initDevServer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/dev-server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AACvB,iDAAsC;AACtC,kDAA0B;AAE1B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/dev-server/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import type { ChildProcess, ChildProcessWithoutNullStreams } from "child_process
|
|
|
3
3
|
import type { Config } from "../config";
|
|
4
4
|
export declare const findCwd: (configPath: string) => string;
|
|
5
5
|
export declare const pipeLogsWithPrefix: (childProcess: ChildProcess | ChildProcessWithoutNullStreams, prefix: string) => void;
|
|
6
|
+
export declare const probeServer: (readinessProbe: Exclude<Config["devServer"]["readinessProbe"], Function>) => Promise<boolean>;
|
|
6
7
|
export declare const waitDevServerReady: (devServer: ChildProcessWithoutNullStreams, readinessProbe: Config["devServer"]["readinessProbe"]) => Promise<void>;
|
|
7
8
|
declare const _default: {
|
|
8
9
|
findCwd: (configPath: string) => string;
|