testplane 8.21.0 → 8.22.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 +8 -1
- package/build/src/browser/browser.d.ts +4 -0
- package/build/src/browser/browser.js +2 -0
- package/build/src/browser/browser.js.map +1 -1
- package/build/src/browser/existing-browser.d.ts +2 -0
- package/build/src/browser/existing-browser.js +2 -2
- package/build/src/browser/existing-browser.js.map +1 -1
- package/build/src/browser/new-browser.d.ts +5 -2
- package/build/src/browser/new-browser.js +53 -7
- package/build/src/browser/new-browser.js.map +1 -1
- package/build/src/browser-installer/chrome/browser.d.ts +3 -0
- package/build/src/browser-installer/chrome/browser.js +67 -0
- package/build/src/browser-installer/chrome/browser.js.map +1 -0
- package/build/src/browser-installer/chrome/driver.d.ts +3 -0
- package/build/src/browser-installer/chrome/driver.js +65 -0
- package/build/src/browser-installer/chrome/driver.js.map +1 -0
- package/build/src/browser-installer/chrome/index.d.ts +14 -0
- package/build/src/browser-installer/chrome/index.js +34 -0
- package/build/src/browser-installer/chrome/index.js.map +1 -0
- package/build/src/browser-installer/chromium/browser.d.ts +3 -0
- package/build/src/browser-installer/chromium/browser.js +46 -0
- package/build/src/browser-installer/chromium/browser.js.map +1 -0
- package/build/src/browser-installer/chromium/driver.d.ts +1 -0
- package/build/src/browser-installer/chromium/driver.js +41 -0
- package/build/src/browser-installer/chromium/driver.js.map +1 -0
- package/build/src/browser-installer/chromium/index.d.ts +2 -0
- package/build/src/browser-installer/chromium/index.js +8 -0
- package/build/src/browser-installer/chromium/index.js.map +1 -0
- package/build/src/browser-installer/chromium/revisions/linux.d.ts +2 -0
- package/build/src/browser-installer/chromium/revisions/linux.js +45 -0
- package/build/src/browser-installer/chromium/revisions/linux.js.map +1 -0
- package/build/src/browser-installer/chromium/revisions/mac.d.ts +2 -0
- package/build/src/browser-installer/chromium/revisions/mac.js +45 -0
- package/build/src/browser-installer/chromium/revisions/mac.js.map +1 -0
- package/build/src/browser-installer/chromium/revisions/mac_arm.d.ts +2 -0
- package/build/src/browser-installer/chromium/revisions/mac_arm.js +25 -0
- package/build/src/browser-installer/chromium/revisions/mac_arm.js.map +1 -0
- package/build/src/browser-installer/chromium/revisions/win32.d.ts +2 -0
- package/build/src/browser-installer/chromium/revisions/win32.js +45 -0
- package/build/src/browser-installer/chromium/revisions/win32.js.map +1 -0
- package/build/src/browser-installer/chromium/revisions/win64.d.ts +2 -0
- package/build/src/browser-installer/chromium/revisions/win64.js +45 -0
- package/build/src/browser-installer/chromium/revisions/win64.js.map +1 -0
- package/build/src/browser-installer/chromium/utils.d.ts +4 -0
- package/build/src/browser-installer/chromium/utils.js +61 -0
- package/build/src/browser-installer/chromium/utils.js.map +1 -0
- package/build/src/browser-installer/constants.d.ts +13 -0
- package/build/src/browser-installer/constants.js +17 -0
- package/build/src/browser-installer/constants.js.map +1 -0
- package/build/src/browser-installer/edge/driver.d.ts +3 -0
- package/build/src/browser-installer/edge/driver.js +36 -0
- package/build/src/browser-installer/edge/driver.js.map +1 -0
- package/build/src/browser-installer/edge/index.d.ts +13 -0
- package/build/src/browser-installer/edge/index.js +30 -0
- package/build/src/browser-installer/edge/index.js.map +1 -0
- package/build/src/browser-installer/firefox/browser.d.ts +3 -0
- package/build/src/browser-installer/firefox/browser.js +38 -0
- package/build/src/browser-installer/firefox/browser.js.map +1 -0
- package/build/src/browser-installer/firefox/driver.d.ts +3 -0
- package/build/src/browser-installer/firefox/driver.js +30 -0
- package/build/src/browser-installer/firefox/driver.js.map +1 -0
- package/build/src/browser-installer/firefox/index.d.ts +14 -0
- package/build/src/browser-installer/firefox/index.js +40 -0
- package/build/src/browser-installer/firefox/index.js.map +1 -0
- package/build/src/browser-installer/firefox/utils.d.ts +2 -0
- package/build/src/browser-installer/firefox/utils.js +16 -0
- package/build/src/browser-installer/firefox/utils.js.map +1 -0
- package/build/src/browser-installer/index.d.ts +4 -0
- package/build/src/browser-installer/index.js +12 -0
- package/build/src/browser-installer/index.js.map +1 -0
- package/build/src/browser-installer/install.d.ts +32 -0
- package/build/src/browser-installer/install.js +106 -0
- package/build/src/browser-installer/install.js.map +1 -0
- package/build/src/browser-installer/registry/cli-progress-bar.d.ts +5 -0
- package/build/src/browser-installer/registry/cli-progress-bar.js +30 -0
- package/build/src/browser-installer/registry/cli-progress-bar.js.map +1 -0
- package/build/src/browser-installer/registry/index.d.ts +8 -0
- package/build/src/browser-installer/registry/index.js +161 -0
- package/build/src/browser-installer/registry/index.js.map +1 -0
- package/build/src/browser-installer/run.d.ts +12 -0
- package/build/src/browser-installer/run.js +43 -0
- package/build/src/browser-installer/run.js.map +1 -0
- package/build/src/browser-installer/safari/index.d.ts +11 -0
- package/build/src/browser-installer/safari/index.js +27 -0
- package/build/src/browser-installer/safari/index.js.map +1 -0
- package/build/src/browser-installer/utils.d.ts +35 -0
- package/build/src/browser-installer/utils.js +148 -0
- package/build/src/browser-installer/utils.js.map +1 -0
- package/build/src/browser-pool/basic-pool.d.ts +1 -0
- package/build/src/browser-pool/basic-pool.js +3 -1
- package/build/src/browser-pool/basic-pool.js.map +1 -1
- package/build/src/browser-pool/webdriver-pool.d.ts +17 -0
- package/build/src/browser-pool/webdriver-pool.js +69 -0
- package/build/src/browser-pool/webdriver-pool.js.map +1 -0
- package/build/src/cli/commands/install-deps/index.d.ts +2 -0
- package/build/src/cli/commands/install-deps/index.js +72 -0
- package/build/src/cli/commands/install-deps/index.js.map +1 -0
- package/build/src/cli/constants.d.ts +1 -0
- package/build/src/cli/constants.js +1 -0
- package/build/src/cli/constants.js.map +1 -1
- package/build/src/cli/index.js +3 -1
- package/build/src/cli/index.js.map +1 -1
- package/build/src/constants/config.d.ts +1 -0
- package/build/src/constants/config.js +1 -0
- package/build/src/constants/config.js.map +1 -1
- package/build/src/dev-server/utils.d.ts +5 -5
- package/build/src/dev-server/utils.js +4 -0
- package/build/src/dev-server/utils.js.map +1 -1
- package/build/src/error-snippets/index.js +0 -5
- package/build/src/error-snippets/index.js.map +1 -1
- package/build/src/testplane.d.ts +2 -1
- package/build/src/testplane.js +2 -2
- package/build/src/testplane.js.map +1 -1
- package/package.json +8 -1
|
@@ -0,0 +1,148 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.unzipFile = exports.downloadFile = exports.retryFetch = exports.getChromeDriverDir = exports.getChromiumDriverDir = exports.getEdgeDriverDir = exports.getGeckoDriverDir = exports.getBrowsersDir = exports.getRegistryPath = exports.getChromePlatform = exports.getBrowserPlatform = exports.normalizeChromeVersion = exports.semverVersionsComparator = exports.getMilestone = exports.createBrowserLabel = exports.getDriverNameForBrowserName = exports.Driver = exports.Browser = exports.browserInstallerDebug = void 0;
|
|
7
|
+
const browsers_1 = require("@puppeteer/browsers");
|
|
8
|
+
const extract_zip_1 = __importDefault(require("extract-zip"));
|
|
9
|
+
const os_1 = __importDefault(require("os"));
|
|
10
|
+
const path_1 = __importDefault(require("path"));
|
|
11
|
+
const fs_1 = require("fs");
|
|
12
|
+
const stream_1 = require("stream");
|
|
13
|
+
const debug_1 = __importDefault(require("debug"));
|
|
14
|
+
const constants_1 = require("./constants");
|
|
15
|
+
exports.browserInstallerDebug = (0, debug_1.default)("testplane:browser-installer");
|
|
16
|
+
exports.Browser = {
|
|
17
|
+
CHROME: browsers_1.Browser.CHROME,
|
|
18
|
+
CHROMIUM: browsers_1.Browser.CHROMIUM,
|
|
19
|
+
FIREFOX: browsers_1.Browser.FIREFOX,
|
|
20
|
+
SAFARI: "safari",
|
|
21
|
+
EDGE: "MicrosoftEdge",
|
|
22
|
+
};
|
|
23
|
+
exports.Driver = {
|
|
24
|
+
CHROMEDRIVER: browsers_1.Browser.CHROMEDRIVER,
|
|
25
|
+
GECKODRIVER: "geckodriver",
|
|
26
|
+
SAFARIDRIVER: "safaridriver",
|
|
27
|
+
EDGEDRIVER: "edgedriver",
|
|
28
|
+
};
|
|
29
|
+
const getDriverNameForBrowserName = (browserName) => {
|
|
30
|
+
if (browserName === exports.Browser.CHROME || browserName === exports.Browser.CHROMIUM) {
|
|
31
|
+
return exports.Driver.CHROMEDRIVER;
|
|
32
|
+
}
|
|
33
|
+
if (browserName === exports.Browser.FIREFOX) {
|
|
34
|
+
return exports.Driver.GECKODRIVER;
|
|
35
|
+
}
|
|
36
|
+
if (browserName === exports.Browser.SAFARI) {
|
|
37
|
+
return exports.Driver.SAFARIDRIVER;
|
|
38
|
+
}
|
|
39
|
+
if (browserName === exports.Browser.EDGE) {
|
|
40
|
+
return exports.Driver.EDGEDRIVER;
|
|
41
|
+
}
|
|
42
|
+
return null;
|
|
43
|
+
};
|
|
44
|
+
exports.getDriverNameForBrowserName = getDriverNameForBrowserName;
|
|
45
|
+
const createBrowserLabel = (browserName, version = "latest") => browserName + "@" + version;
|
|
46
|
+
exports.createBrowserLabel = createBrowserLabel;
|
|
47
|
+
const getMilestone = (version) => {
|
|
48
|
+
if (typeof version === "number") {
|
|
49
|
+
return String(version);
|
|
50
|
+
}
|
|
51
|
+
return version.split(".")[0];
|
|
52
|
+
};
|
|
53
|
+
exports.getMilestone = getMilestone;
|
|
54
|
+
const semverVersionsComparator = (a, b) => {
|
|
55
|
+
const splitVersion = (version) => version
|
|
56
|
+
.replaceAll(/[^\d.]/g, "")
|
|
57
|
+
.split(".")
|
|
58
|
+
.filter(Boolean)
|
|
59
|
+
.map(Number);
|
|
60
|
+
const versionPartsA = splitVersion(a);
|
|
61
|
+
const versionPartsB = splitVersion(b);
|
|
62
|
+
for (let i = 0; i < Math.min(versionPartsA.length, versionPartsB.length); i++) {
|
|
63
|
+
if (versionPartsA[i] !== versionPartsB[i]) {
|
|
64
|
+
return versionPartsA[i] - versionPartsB[i];
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
return 0;
|
|
68
|
+
};
|
|
69
|
+
exports.semverVersionsComparator = semverVersionsComparator;
|
|
70
|
+
const normalizeChromeVersion = (version) => {
|
|
71
|
+
const versionParts = version.split(".").filter(Boolean);
|
|
72
|
+
if (versionParts.length === 2) {
|
|
73
|
+
return versionParts[0];
|
|
74
|
+
}
|
|
75
|
+
if (versionParts.length >= 3) {
|
|
76
|
+
return versionParts.slice(0, 3).join(".");
|
|
77
|
+
}
|
|
78
|
+
return versionParts[0];
|
|
79
|
+
};
|
|
80
|
+
exports.normalizeChromeVersion = normalizeChromeVersion;
|
|
81
|
+
const getBrowserPlatform = () => {
|
|
82
|
+
const platform = (0, browsers_1.detectBrowserPlatform)();
|
|
83
|
+
if (!platform) {
|
|
84
|
+
throw new Error(`Got an error while trying to download browsers: platform "${platform}" is not supported`);
|
|
85
|
+
}
|
|
86
|
+
return platform;
|
|
87
|
+
};
|
|
88
|
+
exports.getBrowserPlatform = getBrowserPlatform;
|
|
89
|
+
const getChromePlatform = (version) => {
|
|
90
|
+
const milestone = (0, exports.getMilestone)(version);
|
|
91
|
+
const platform = (0, exports.getBrowserPlatform)();
|
|
92
|
+
if (platform === browsers_1.BrowserPlatform.MAC_ARM && Number(milestone) < constants_1.MIN_CHROMIUM_MAC_ARM_VERSION) {
|
|
93
|
+
return browsers_1.BrowserPlatform.MAC;
|
|
94
|
+
}
|
|
95
|
+
return platform;
|
|
96
|
+
};
|
|
97
|
+
exports.getChromePlatform = getChromePlatform;
|
|
98
|
+
const resolveUserPath = (userPath) => userPath.startsWith("~") ? path_1.default.resolve(os_1.default.homedir(), userPath.slice(1)) : path_1.default.resolve(userPath);
|
|
99
|
+
const getCacheDir = (envValueOverride = process.env.TESTPLANE_BROWSERS_PATH) => envValueOverride ? resolveUserPath(envValueOverride) : path_1.default.join(os_1.default.homedir(), ".testplane");
|
|
100
|
+
const getRegistryPath = (envValueOverride) => path_1.default.join(getCacheDir(envValueOverride), "registry.json");
|
|
101
|
+
exports.getRegistryPath = getRegistryPath;
|
|
102
|
+
const getBrowsersDir = () => path_1.default.join(getCacheDir(), "browsers");
|
|
103
|
+
exports.getBrowsersDir = getBrowsersDir;
|
|
104
|
+
const getDriversDir = () => path_1.default.join(getCacheDir(), "drivers");
|
|
105
|
+
const getDriverDir = (driverName, driverVersion) => path_1.default.join(getDriversDir(), driverName, driverVersion);
|
|
106
|
+
const getGeckoDriverDir = (driverVersion) => getDriverDir("geckodriver", (0, exports.getBrowserPlatform)() + "-" + driverVersion);
|
|
107
|
+
exports.getGeckoDriverDir = getGeckoDriverDir;
|
|
108
|
+
const getEdgeDriverDir = (driverVersion) => getDriverDir("edgedriver", (0, exports.getBrowserPlatform)() + "-" + driverVersion);
|
|
109
|
+
exports.getEdgeDriverDir = getEdgeDriverDir;
|
|
110
|
+
const getChromiumDriverDir = (driverVersion) => getDriverDir("chromedriver", (0, exports.getBrowserPlatform)() + "-" + driverVersion);
|
|
111
|
+
exports.getChromiumDriverDir = getChromiumDriverDir;
|
|
112
|
+
const getChromeDriverDir = () => getDriversDir(); // path is set by @puppeteer/browsers.install
|
|
113
|
+
exports.getChromeDriverDir = getChromeDriverDir;
|
|
114
|
+
const retryFetch = async (url, opts, retry = 3, retryDelay = 100) => {
|
|
115
|
+
while (retry > 0) {
|
|
116
|
+
try {
|
|
117
|
+
return await fetch(url, opts);
|
|
118
|
+
}
|
|
119
|
+
catch (e) {
|
|
120
|
+
retry = retry - 1;
|
|
121
|
+
if (retry <= 0) {
|
|
122
|
+
throw e;
|
|
123
|
+
}
|
|
124
|
+
await new Promise(resolve => setTimeout(resolve, retryDelay));
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
return null;
|
|
128
|
+
};
|
|
129
|
+
exports.retryFetch = retryFetch;
|
|
130
|
+
const downloadFile = async (url, filePath) => {
|
|
131
|
+
const writeStream = (0, fs_1.createWriteStream)(filePath);
|
|
132
|
+
const response = await fetch(url);
|
|
133
|
+
if (!response.ok || !response.body) {
|
|
134
|
+
throw new Error(`Unable to download file from ${url}: ${response.statusText}`);
|
|
135
|
+
}
|
|
136
|
+
const stream = stream_1.Readable.fromWeb(response.body).pipe(writeStream);
|
|
137
|
+
return new Promise((resolve, reject) => {
|
|
138
|
+
stream.on("error", reject);
|
|
139
|
+
stream.on("close", resolve);
|
|
140
|
+
});
|
|
141
|
+
};
|
|
142
|
+
exports.downloadFile = downloadFile;
|
|
143
|
+
const unzipFile = async (zipPath, outputDir) => {
|
|
144
|
+
await (0, extract_zip_1.default)(zipPath, { dir: outputDir });
|
|
145
|
+
return outputDir;
|
|
146
|
+
};
|
|
147
|
+
exports.unzipFile = unzipFile;
|
|
148
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/browser-installer/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ export declare class BasicPool implements Pool {
|
|
|
8
8
|
private _emitter;
|
|
9
9
|
private _activeSessions;
|
|
10
10
|
private _cancelled;
|
|
11
|
+
private _wdPool;
|
|
11
12
|
log: debug.Debugger;
|
|
12
13
|
static create(config: Config, emitter: AsyncEmitter): BasicPool;
|
|
13
14
|
constructor(config: Config, emitter: AsyncEmitter);
|
|
@@ -9,6 +9,7 @@ const lodash_1 = __importDefault(require("lodash"));
|
|
|
9
9
|
const new_browser_1 = require("../browser/new-browser");
|
|
10
10
|
const cancelled_error_1 = require("./cancelled-error");
|
|
11
11
|
const events_1 = require("../events");
|
|
12
|
+
const webdriver_pool_1 = require("./webdriver-pool");
|
|
12
13
|
class BasicPool {
|
|
13
14
|
static create(config, emitter) {
|
|
14
15
|
return new BasicPool(config, emitter);
|
|
@@ -19,9 +20,10 @@ class BasicPool {
|
|
|
19
20
|
this.log = (0, debug_1.default)("testplane:pool:basic");
|
|
20
21
|
this._activeSessions = {};
|
|
21
22
|
this._cancelled = false;
|
|
23
|
+
this._wdPool = new webdriver_pool_1.WebdriverPool();
|
|
22
24
|
}
|
|
23
25
|
async getBrowser(id, opts = {}) {
|
|
24
|
-
const browser = new_browser_1.NewBrowser.create(this._config, { ...opts, id });
|
|
26
|
+
const browser = new_browser_1.NewBrowser.create(this._config, { ...opts, id, wdPool: this._wdPool });
|
|
25
27
|
try {
|
|
26
28
|
await browser.init();
|
|
27
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":";;;;;;AAAA,kDAA0B;AAC1B,oDAAuB;AAEvB,wDAAoD;AACpD,uDAAmD;AACnD,sCAAuD;
|
|
1
|
+
{"version":3,"file":"basic-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/basic-pool.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,oDAAuB;AAEvB,wDAAoD;AACpD,uDAAmD;AACnD,sCAAuD;AAIvD,qDAAiD;AAEjD,MAAa,SAAS;IAQlB,MAAM,CAAC,MAAM,CAAC,MAAc,EAAE,OAAqB;QAC/C,OAAO,IAAI,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED,YAAY,MAAc,EAAE,OAAqB;QAC7C,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,GAAG,GAAG,IAAA,eAAK,EAAC,sBAAsB,CAAC,CAAC;QAEzC,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,IAAI,8BAAa,EAAE,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU,EAAE,OAAoB,EAAE;QAC/C,MAAM,OAAO,GAAG,wBAAU,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAEvF,IAAI,CAAC;YACD,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;YACrB,IAAI,CAAC,GAAG,CAAC,WAAW,OAAO,CAAC,MAAM,UAAU,CAAC,CAAC;YAE9C,MAAM,IAAI,CAAC,KAAK,CAAC,qBAAY,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;YAEtD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBAClB,MAAM,IAAI,gCAAc,EAAE,CAAC;YAC/B,CAAC;YAED,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;YAEtB,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC;YAClD,OAAO,OAAO,CAAC;QACnB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;gBACpB,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACpC,CAAC;YAED,MAAM,CAAC,CAAC;QACZ,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAmB;QACjC,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAE/C,IAAI,CAAC,GAAG,CAAC,gBAAgB,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAE3C,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,KAAK,CAAC,qBAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YACpD,8DAA8D;QAClE,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAChB,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC;QAC5C,CAAC;QAED,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC;IAEO,KAAK,CAAC,KAAa,EAAE,OAAgB;QACzC,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,SAAS,EAAE;YACvD,SAAS,EAAE,OAAO,CAAC,EAAE;YACrB,SAAS,EAAE,OAAO,CAAC,SAAS;SAC/B,CAAC,CAAC;IACP,CAAC;IAED,MAAM;QACF,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QAEvB,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAE3D,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;IAC9B,CAAC;CACJ;AA7ED,8BA6EC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { SupportedBrowser } from "../browser-installer";
|
|
2
|
+
export type WdProcess = {
|
|
3
|
+
gridUrl: string;
|
|
4
|
+
free: () => void;
|
|
5
|
+
kill: () => void;
|
|
6
|
+
};
|
|
7
|
+
export declare class WebdriverPool {
|
|
8
|
+
private driverProcess;
|
|
9
|
+
private portToDriverProcess;
|
|
10
|
+
constructor();
|
|
11
|
+
getWebdriver(browserName: SupportedBrowser, browserVersion: string, { debug }?: {
|
|
12
|
+
debug?: boolean | undefined;
|
|
13
|
+
}): ReturnType<typeof this.createWebdriverProcess>;
|
|
14
|
+
private freeWebdriver;
|
|
15
|
+
private killWebdriver;
|
|
16
|
+
private createWebdriverProcess;
|
|
17
|
+
}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.WebdriverPool = void 0;
|
|
4
|
+
const browser_installer_1 = require("../browser-installer");
|
|
5
|
+
class WebdriverPool {
|
|
6
|
+
constructor() {
|
|
7
|
+
this.driverProcess = new Map();
|
|
8
|
+
this.portToDriverProcess = new Map();
|
|
9
|
+
}
|
|
10
|
+
async getWebdriver(browserName, browserVersion, { debug = false } = {}) {
|
|
11
|
+
const driverName = (0, browser_installer_1.getDriverNameForBrowserName)(browserName);
|
|
12
|
+
if (!driverName) {
|
|
13
|
+
throw new Error([
|
|
14
|
+
`Couldn't run browser driver for "${browserName}", as this browser is not supported`,
|
|
15
|
+
`Supported browsers: "chrome", "firefox", "safari", "MicrosoftEdge"`,
|
|
16
|
+
].join("\n"));
|
|
17
|
+
}
|
|
18
|
+
if (!browserVersion) {
|
|
19
|
+
throw new Error(`Couldn't run browser driver for "${browserName}" because its version is undefined`);
|
|
20
|
+
}
|
|
21
|
+
const wdProcesses = this.driverProcess.get(driverName)?.get(browserVersion) ?? {};
|
|
22
|
+
for (const port in wdProcesses) {
|
|
23
|
+
if (!wdProcesses[port].isBusy) {
|
|
24
|
+
wdProcesses[port].isBusy = true;
|
|
25
|
+
return {
|
|
26
|
+
gridUrl: wdProcesses[port].gridUrl,
|
|
27
|
+
free: () => this.freeWebdriver(port),
|
|
28
|
+
kill: () => this.killWebdriver(driverName, browserVersion, port),
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
return this.createWebdriverProcess(driverName, browserVersion, { debug });
|
|
33
|
+
}
|
|
34
|
+
freeWebdriver(port) {
|
|
35
|
+
const wdProcess = this.portToDriverProcess.get(port);
|
|
36
|
+
if (wdProcess) {
|
|
37
|
+
wdProcess.isBusy = false;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
killWebdriver(driverName, browserVersion, port) {
|
|
41
|
+
const wdProcess = this.portToDriverProcess.get(port);
|
|
42
|
+
const nodes = this.driverProcess.get(driverName)?.get(browserVersion);
|
|
43
|
+
if (wdProcess && nodes) {
|
|
44
|
+
wdProcess.process.kill();
|
|
45
|
+
this.portToDriverProcess.delete(port);
|
|
46
|
+
delete nodes[port];
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
async createWebdriverProcess(driverName, browserVersion, { debug = false } = {}) {
|
|
50
|
+
const driver = await (0, browser_installer_1.runBrowserDriver)(driverName, browserVersion, { debug });
|
|
51
|
+
if (!this.driverProcess.has(driverName)) {
|
|
52
|
+
this.driverProcess.set(driverName, new Map());
|
|
53
|
+
}
|
|
54
|
+
if (!this.driverProcess.get(driverName)?.has(browserVersion)) {
|
|
55
|
+
this.driverProcess.get(driverName)?.set(browserVersion, {});
|
|
56
|
+
}
|
|
57
|
+
const nodes = this.driverProcess.get(driverName)?.get(browserVersion);
|
|
58
|
+
const node = { process: driver.process, gridUrl: driver.gridUrl, isBusy: true };
|
|
59
|
+
nodes[driver.port] = node;
|
|
60
|
+
this.portToDriverProcess.set(String(driver.port), node);
|
|
61
|
+
return {
|
|
62
|
+
gridUrl: driver.gridUrl,
|
|
63
|
+
free: () => this.freeWebdriver(String(driver.port)),
|
|
64
|
+
kill: () => this.killWebdriver(driverName, browserVersion, String(driver.port)),
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
exports.WebdriverPool = WebdriverPool;
|
|
69
|
+
//# sourceMappingURL=webdriver-pool.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"webdriver-pool.js","sourceRoot":"","sources":["../../../src/browser-pool/webdriver-pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.registerCmd = void 0;
|
|
7
|
+
const constants_1 = require("../../constants");
|
|
8
|
+
const logger_1 = __importDefault(require("../../../utils/logger"));
|
|
9
|
+
const browser_installer_1 = require("../../../browser-installer");
|
|
10
|
+
const { INSTALL_DEPS: commandName } = constants_1.CliCommands;
|
|
11
|
+
const logResult = (browsersInstallPerStatus, logType, status, heading, formatLine) => {
|
|
12
|
+
if (!browsersInstallPerStatus[status].length) {
|
|
13
|
+
return;
|
|
14
|
+
}
|
|
15
|
+
logger_1.default[logType]([heading, ...browsersInstallPerStatus[status].map(formatLine), ""].join("\n"));
|
|
16
|
+
};
|
|
17
|
+
const registerCmd = (cliTool, testplane) => {
|
|
18
|
+
cliTool
|
|
19
|
+
.command(commandName)
|
|
20
|
+
.description("Install browsers to run locally with 'gridUrl': 'local' or '--local' cli argument")
|
|
21
|
+
.arguments("[browsers...]")
|
|
22
|
+
.action(async (browsers) => {
|
|
23
|
+
try {
|
|
24
|
+
if (!browsers.length) {
|
|
25
|
+
browsers = Object.keys(testplane.config.browsers);
|
|
26
|
+
}
|
|
27
|
+
const browsersToInstall = browsers.map(browser => {
|
|
28
|
+
if (browser in testplane.config.browsers) {
|
|
29
|
+
const browserConfig = testplane.config.browsers[browser];
|
|
30
|
+
const { browserName, browserVersion } = browserConfig.desiredCapabilities || {};
|
|
31
|
+
return { browserName, browserVersion };
|
|
32
|
+
}
|
|
33
|
+
else if (browser.includes("@")) {
|
|
34
|
+
const [browserName, browserVersion] = browser.split("@", 2);
|
|
35
|
+
return { browserName, browserVersion };
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
throw new Error([
|
|
39
|
+
`Unknown browser: ${browser}.`,
|
|
40
|
+
`Expected config's <browserId> or '<browserName>@<browserVersion>' (example: "chrome@130")`,
|
|
41
|
+
].join("\n"));
|
|
42
|
+
}
|
|
43
|
+
});
|
|
44
|
+
const browsersInstallResult = await (0, browser_installer_1.installBrowsersWithDrivers)(browsersToInstall);
|
|
45
|
+
const browserTags = Object.keys(browsersInstallResult);
|
|
46
|
+
const browsersInstallPerStatus = {
|
|
47
|
+
[browser_installer_1.BrowserInstallStatus.Ok]: [],
|
|
48
|
+
[browser_installer_1.BrowserInstallStatus.Skip]: [],
|
|
49
|
+
[browser_installer_1.BrowserInstallStatus.Error]: [],
|
|
50
|
+
};
|
|
51
|
+
for (const tag of browserTags) {
|
|
52
|
+
const result = browsersInstallResult[tag];
|
|
53
|
+
const bucket = browsersInstallPerStatus[result.status];
|
|
54
|
+
if ("reason" in result) {
|
|
55
|
+
bucket.push({ tag, reason: result.reason });
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
bucket.push({ tag });
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
logResult(browsersInstallPerStatus, "log", browser_installer_1.BrowserInstallStatus.Ok, "These browsers are downloaded successfully:", ({ tag }) => `- ${tag}`);
|
|
62
|
+
logResult(browsersInstallPerStatus, "warn", browser_installer_1.BrowserInstallStatus.Skip, "Browser install for these browsers was skipped:", ({ tag, reason }) => `- ${tag}: ${reason}`);
|
|
63
|
+
logResult(browsersInstallPerStatus, "error", browser_installer_1.BrowserInstallStatus.Error, "An error occured while trying to download these browsers:", ({ tag, reason }) => `- ${tag}: ${reason}`);
|
|
64
|
+
}
|
|
65
|
+
catch (err) {
|
|
66
|
+
logger_1.default.error(err.stack || err);
|
|
67
|
+
process.exit(1);
|
|
68
|
+
}
|
|
69
|
+
});
|
|
70
|
+
};
|
|
71
|
+
exports.registerCmd = registerCmd;
|
|
72
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
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":"constants.js","sourceRoot":"","sources":["../../../src/cli/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG;IACvB,UAAU,EAAE,YAAY;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/cli/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG;IACvB,UAAU,EAAE,YAAY;IACxB,YAAY,EAAE,cAAc;CACtB,CAAC"}
|
package/build/src/cli/index.js
CHANGED
|
@@ -54,10 +54,11 @@ const run = (opts = {}) => {
|
|
|
54
54
|
.option("--repl-before-test [type]", "open repl interface before test run", Boolean, false)
|
|
55
55
|
.option("--repl-on-fail [type]", "open repl interface on test fail only", Boolean, false)
|
|
56
56
|
.option("--devtools", "switches the browser to the devtools mode with using CDP protocol")
|
|
57
|
+
.option("--local", "use local browsers, managed by testplane (same as 'gridUrl': 'local')")
|
|
57
58
|
.arguments("[paths...]")
|
|
58
59
|
.action(async (paths) => {
|
|
59
60
|
try {
|
|
60
|
-
const { reporter: reporters, browser: browsers, set: sets, grep, updateRefs, require: requireModules, inspect, inspectBrk, repl, replBeforeTest, replOnFail, devtools, } = program;
|
|
61
|
+
const { reporter: reporters, browser: browsers, set: sets, grep, updateRefs, require: requireModules, inspect, inspectBrk, repl, replBeforeTest, replOnFail, devtools, local, } = program;
|
|
61
62
|
await (0, cli_1.handleRequires)(requireModules);
|
|
62
63
|
const isTestsSuccess = await testplane.run(paths, {
|
|
63
64
|
reporters: reporters || defaults_1.default.reporters,
|
|
@@ -73,6 +74,7 @@ const run = (opts = {}) => {
|
|
|
73
74
|
onFail: replOnFail,
|
|
74
75
|
},
|
|
75
76
|
devtools: devtools || false,
|
|
77
|
+
local: local || false,
|
|
76
78
|
});
|
|
77
79
|
process.exit(isTestsSuccess ? 0 : 1);
|
|
78
80
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/constants/config.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,CAAC,OAAO,GAAG;IACb,kBAAkB,EAAE,WAAW;IAC/B,iBAAiB,EAAE,UAAU;IAC7B,iBAAiB,EAAE;QACf,GAAG,EAAE,KAAK;QACV,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,YAAY;KAC5B;IACD,mBAAmB,EAAE,QAAQ;IAC7B,oBAAoB,EAAE,SAAS;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/constants/config.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,CAAC,OAAO,GAAG;IACb,kBAAkB,EAAE,WAAW;IAC/B,iBAAiB,EAAE,UAAU;IAC7B,iBAAiB,EAAE;QACf,GAAG,EAAE,KAAK;QACV,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,YAAY;KAC5B;IACD,mBAAmB,EAAE,QAAQ;IAC7B,oBAAoB,EAAE,SAAS;IAC/B,cAAc,EAAE,OAAO;CAC1B,CAAC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import type { ChildProcessWithoutNullStreams } from "child_process";
|
|
2
|
+
import type { ChildProcess, ChildProcessWithoutNullStreams } from "child_process";
|
|
3
3
|
import type { Config } from "../config";
|
|
4
4
|
export declare const findCwd: (configPath: string) => string;
|
|
5
|
-
export declare const pipeLogsWithPrefix: (childProcess: ChildProcessWithoutNullStreams, prefix: string) => void;
|
|
5
|
+
export declare const pipeLogsWithPrefix: (childProcess: ChildProcess | ChildProcessWithoutNullStreams, prefix: string) => void;
|
|
6
6
|
export declare const waitDevServerReady: (devServer: ChildProcessWithoutNullStreams, readinessProbe: Config["devServer"]["readinessProbe"]) => Promise<void>;
|
|
7
7
|
declare const _default: {
|
|
8
8
|
findCwd: (configPath: string) => string;
|
|
9
|
-
pipeLogsWithPrefix: (childProcess: ChildProcessWithoutNullStreams, prefix: string) => void;
|
|
10
|
-
waitDevServerReady: (devServer: ChildProcessWithoutNullStreams, readinessProbe: {
|
|
9
|
+
pipeLogsWithPrefix: (childProcess: ChildProcess | ChildProcessWithoutNullStreams, prefix: string) => void;
|
|
10
|
+
waitDevServerReady: (devServer: ChildProcessWithoutNullStreams, readinessProbe: ((childProcess: ChildProcessWithoutNullStreams) => Promise<void>) | {
|
|
11
11
|
url: string | null;
|
|
12
12
|
isReady: ((response: Response) => boolean | Promise<boolean>) | null;
|
|
13
13
|
timeouts: {
|
|
@@ -15,6 +15,6 @@ declare const _default: {
|
|
|
15
15
|
probeRequestTimeout: number;
|
|
16
16
|
probeRequestInterval: number;
|
|
17
17
|
};
|
|
18
|
-
}
|
|
18
|
+
}) => Promise<void>;
|
|
19
19
|
};
|
|
20
20
|
export default _default;
|
|
@@ -49,6 +49,10 @@ const pipeLogsWithPrefix = (childProcess, prefix) => {
|
|
|
49
49
|
logger_1.default.error("Got an error trying to pipeline dev server logs:", error.message);
|
|
50
50
|
}
|
|
51
51
|
};
|
|
52
|
+
if (!childProcess.stdout || !childProcess.stderr) {
|
|
53
|
+
logger_1.default.error("Couldn't pipe child process logs as it seems to not be spawned successfully");
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
52
56
|
(0, stream_1.pipeline)(childProcess.stdout, new WithPrefixTransformer(prefix), process.stdout, logOnErrorCb);
|
|
53
57
|
(0, stream_1.pipeline)(childProcess.stderr, new WithPrefixTransformer(prefix), process.stderr, logOnErrorCb);
|
|
54
58
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/dev-server/utils.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAgE;AAChE,gDAAwB;AACxB,4CAAoB;AACpB,kDAA0B;AAE1B,6DAAqC;AAG9B,MAAM,OAAO,GAAG,CAAC,UAAkB,EAAU,EAAE;IAClD,IAAI,IAAI,GAAG,UAAU,CAAC;IAEtB,iDAAiD;IACjD,OAAO,IAAI,EAAE,CAAC;QACV,MAAM,GAAG,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE/B,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YACf,OAAO,cAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,gBAAgB,GAAG,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC;QAEvE,IAAI,gBAAgB,EAAE,CAAC;YACnB,OAAO,GAAG,CAAC;QACf,CAAC;QAED,IAAI,GAAG,GAAG,CAAC;IACf,CAAC;AACL,CAAC,CAAC;AAnBW,QAAA,OAAO,WAmBlB;AAEF,MAAM,qBAAsB,SAAQ,kBAAS;IAIzC,YAAY,MAAc;QACtB,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,MAAM,GAAG,eAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAClC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;IAC9B,CAAC;IAED,UAAU,CAAC,KAAa,EAAE,CAAS,EAAE,QAA2B;QAC5D,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;QACrC,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE1C,MAAM,aAAa,GAAG,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC;QAE3E,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3D,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/C,MAAM,UAAU,GAAG,YAAY,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,YAAY,CAAC;QAEpF,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACtB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QAEnC,QAAQ,EAAE,CAAC;IACf,CAAC;CACJ;AAEM,MAAM,kBAAkB,GAAG,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/dev-server/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.extendWithCodeSnippet = void 0;
|
|
7
4
|
const frames_1 = require("./frames");
|
|
8
5
|
const source_maps_1 = require("./source-maps");
|
|
9
6
|
const utils_1 = require("./utils");
|
|
10
|
-
const logger_1 = __importDefault(require("../utils/logger"));
|
|
11
7
|
const stackFrameLocationResolver = async (stackFrame) => {
|
|
12
8
|
const fileContents = await (0, utils_1.getSourceCodeFile)(stackFrame.fileName);
|
|
13
9
|
const sourceMaps = await (0, source_maps_1.extractSourceMaps)(fileContents, stackFrame.fileName);
|
|
@@ -29,7 +25,6 @@ const extendWithCodeSnippet = async (err) => {
|
|
|
29
25
|
return err;
|
|
30
26
|
}
|
|
31
27
|
catch (snippetError) {
|
|
32
|
-
logger_1.default.warn("Unable to apply code snippet:", snippetError);
|
|
33
28
|
return err;
|
|
34
29
|
}
|
|
35
30
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/error-snippets/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/error-snippets/index.ts"],"names":[],"mappings":";;;AAAA,qCAAiF;AACjF,+CAAgF;AAChF,mCAAyF;AAGzF,MAAM,0BAA0B,GAAG,KAAK,EAAE,UAAgC,EAA0B,EAAE;IAClG,MAAM,YAAY,GAAG,MAAM,IAAA,yBAAiB,EAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAClE,MAAM,UAAU,GAAG,MAAM,IAAA,+BAAiB,EAAC,YAAY,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;IAE9E,OAAO,UAAU;QACb,CAAC,CAAC,IAAA,0CAA4B,EAAC,UAAU,EAAE,UAAU,CAAC;QACtD,CAAC,CAAC,IAAA,sCAA6B,EAAC,UAAU,EAAE,YAAY,CAAC,CAAC;AAClE,CAAC,CAAC;AAEK,MAAM,qBAAqB,GAAG,KAAK,EAAE,GAAqB,EAA6B,EAAE;IAC5F,IAAI,CAAC;QACD,IAAI,IAAA,+BAAuB,EAAC,GAAG,CAAC,EAAE,CAAC;YAC/B,OAAO,GAAG,CAAC;QACf,CAAC;QAED,MAAM,kBAAkB,GAAG,IAAA,+BAAsB,EAAC,GAAG,CAAC,CAAC;QAEvD,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACtB,OAAO,GAAG,CAAC;QACf,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,0BAA0B,CAAC,kBAAkB,CAAC,CAAC;QAExF,GAAG,CAAC,OAAO,GAAG,IAAA,0BAAkB,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAElE,OAAO,GAAG,CAAC;IACf,CAAC;IAAC,OAAO,YAAY,EAAE,CAAC;QACpB,OAAO,GAAG,CAAC;IACf,CAAC;AACL,CAAC,CAAC;AApBW,QAAA,qBAAqB,yBAoBhC"}
|
package/build/src/testplane.d.ts
CHANGED
|
@@ -22,6 +22,7 @@ interface RunOpts {
|
|
|
22
22
|
onFail: boolean;
|
|
23
23
|
};
|
|
24
24
|
devtools: boolean;
|
|
25
|
+
local: boolean;
|
|
25
26
|
}
|
|
26
27
|
export type FailedListItem = {
|
|
27
28
|
browserVersion?: string;
|
|
@@ -49,7 +50,7 @@ export declare class Testplane extends BaseTestplane {
|
|
|
49
50
|
constructor(config?: string | ConfigInput);
|
|
50
51
|
extendCli(parser: Command): void;
|
|
51
52
|
protected _init(): Promise<void>;
|
|
52
|
-
run(testPaths: TestCollection | string[], { browsers, sets, grep, updateRefs, requireModules, inspectMode, replMode, devtools, reporters, }?: Partial<RunOpts>): Promise<boolean>;
|
|
53
|
+
run(testPaths: TestCollection | string[], { browsers, sets, grep, updateRefs, requireModules, inspectMode, replMode, devtools, local, reporters, }?: Partial<RunOpts>): Promise<boolean>;
|
|
53
54
|
protected _saveFailed(): Promise<void>;
|
|
54
55
|
protected _readTests(testPaths: string[] | TestCollection, opts: Partial<ReadTestsOpts>): Promise<TestCollection>;
|
|
55
56
|
addTestToRun(test: Test, browserId: string): boolean;
|
package/build/src/testplane.js
CHANGED
|
@@ -39,9 +39,9 @@ class Testplane extends base_testplane_1.BaseTestplane {
|
|
|
39
39
|
});
|
|
40
40
|
return super._init();
|
|
41
41
|
}
|
|
42
|
-
async run(testPaths, { browsers, sets, grep, updateRefs, requireModules, inspectMode, replMode, devtools, reporters = [], } = {}) {
|
|
42
|
+
async run(testPaths, { browsers, sets, grep, updateRefs, requireModules, inspectMode, replMode, devtools, local, reporters = [], } = {}) {
|
|
43
43
|
(0, validators_1.validateUnknownBrowsers)(browsers, lodash_1.default.keys(this._config.browsers));
|
|
44
|
-
runtime_config_1.default.getInstance().extend({ updateRefs, requireModules, inspectMode, replMode, devtools });
|
|
44
|
+
runtime_config_1.default.getInstance().extend({ updateRefs, requireModules, inspectMode, replMode, devtools, local });
|
|
45
45
|
if (replMode?.enabled) {
|
|
46
46
|
this._config.system.mochaOpts.timeout = 0;
|
|
47
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testplane.js","sourceRoot":"","sources":["../../src/testplane.ts"],"names":[],"mappings":";;;;;;AACA,oDAAuB;AACvB,wDAA0B;AAC1B,mCAA+C;AAC/C,qDAAiD;AACjD,qCAAyD;AACzD,sDAAsE;AACtE,6EAAoD;AACpD,qCAA6E;AAC7E,2DAAyC;AACzC,sEAA6C;AAC7C,+CAA2C;AAC3C,uDAAmD;AACnD,6CAAuD;AACvD,2CAA4C;AAC5C,4DAAoC;AACpC,2CAAkD;AAClD,6CAA6C;
|
|
1
|
+
{"version":3,"file":"testplane.js","sourceRoot":"","sources":["../../src/testplane.ts"],"names":[],"mappings":"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"}
|