testplane 8.30.0 → 8.30.2
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 -13
- package/build/src/base-testplane.js +1 -1
- package/build/src/base-testplane.js.map +1 -1
- package/build/src/browser/calibrator.js +1 -5
- package/build/src/browser/calibrator.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 +24 -2
- 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 +26 -3
- 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 +1 -2
- 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 -1
- package/build/src/browser/existing-browser.js.map +1 -1
- package/build/src/browser/history/callstack.d.ts +1 -0
- package/build/src/browser/history/callstack.js +5 -2
- package/build/src/browser/history/callstack.js.map +1 -1
- package/build/src/browser/new-browser.js +3 -13
- package/build/src/browser/new-browser.js.map +1 -1
- package/build/src/browser/screen-shooter/viewport/index.js +2 -3
- package/build/src/browser/screen-shooter/viewport/index.js.map +1 -1
- package/build/src/browser/types.d.ts +5 -5
- package/build/src/browser/types.js +4 -5
- package/build/src/browser/types.js.map +1 -1
- package/build/src/browser-installer/chrome/index.js +6 -1
- package/build/src/browser-installer/chrome/index.js.map +1 -1
- package/build/src/browser-installer/constants.d.ts +1 -0
- package/build/src/browser-installer/constants.js +2 -1
- package/build/src/browser-installer/constants.js.map +1 -1
- package/build/src/browser-installer/edge/index.js +6 -1
- package/build/src/browser-installer/edge/index.js.map +1 -1
- package/build/src/browser-installer/firefox/index.js +6 -1
- package/build/src/browser-installer/firefox/index.js.map +1 -1
- package/build/src/browser-installer/safari/index.js +6 -1
- 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 +25 -2
- package/build/src/browser-pool/basic-pool.js.map +1 -1
- package/build/src/browser-pool/webdriver-pool.js +27 -3
- package/build/src/browser-pool/webdriver-pool.js.map +1 -1
- package/build/src/bundle/cjs/index.js +1244 -75659
- 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/types.d.ts +1 -1
- package/build/src/constants/png.d.ts +13 -0
- package/build/src/constants/png.js +17 -0
- package/build/src/constants/png.js.map +1 -0
- package/build/src/error-snippets/source-maps.js +7 -1
- package/build/src/error-snippets/source-maps.js.map +1 -1
- package/build/src/image.d.ts +14 -14
- package/build/src/image.js +80 -91
- package/build/src/image.js.map +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/index.js +1 -4
- package/build/src/test-reader/index.js.map +1 -1
- package/build/src/test-reader/sets-builder/index.d.ts +1 -1
- package/build/src/test-reader/sets-builder/index.js +6 -5
- 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 +2 -3
- package/build/src/test-reader/sets-builder/test-set.js.map +1 -1
- package/build/src/test-reader/test-parser.d.ts +1 -4
- package/build/src/test-reader/test-parser.js +5 -10
- 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 -3
- package/build/src/testplane.js.map +1 -1
- package/build/src/types/index.d.ts +13 -13
- package/build/src/utils/eight-bit-rgba-to-png.d.ts +2 -0
- package/build/src/utils/eight-bit-rgba-to-png.js +61 -0
- package/build/src/utils/eight-bit-rgba-to-png.js.map +1 -0
- package/build/src/utils/preload-utils.d.ts +2 -0
- package/build/src/utils/preload-utils.js +13 -0
- package/build/src/utils/preload-utils.js.map +1 -0
- package/build/src/utils/processor.d.ts +2 -2
- package/build/src/utils/processor.js +12 -2
- package/build/src/utils/processor.js.map +1 -1
- package/build/src/utils/typescript.d.ts +6 -1
- package/build/src/utils/typescript.js +90 -71
- package/build/src/utils/typescript.js.map +1 -1
- package/build/src/utils/workers-registry.js +7 -2
- package/build/src/utils/workers-registry.js.map +1 -1
- package/build/src/worker/browser-env/runner/test-runner/index.d.ts +2 -1
- package/build/src/worker/browser-env/runner/test-runner/index.js +5 -2
- package/build/src/worker/browser-env/runner/test-runner/index.js.map +1 -1
- package/build/src/worker/runner/index.js +32 -7
- package/build/src/worker/runner/index.js.map +1 -1
- package/build/src/worker/runner/simple-test-parser.js +1 -8
- package/build/src/worker/runner/simple-test-parser.js.map +1 -1
- package/build/src/worker/runner/test-runner/index.d.ts +8 -9
- package/build/src/worker/runner/test-runner/index.js +30 -10
- package/build/src/worker/runner/test-runner/index.js.map +1 -1
- package/package.json +8 -13
- package/build/src/bundle/test-transformer.d.ts +0 -4
- package/build/src/bundle/test-transformer.js +0 -9
- package/build/src/bundle/test-transformer.js.map +0 -1
|
@@ -26,86 +26,105 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.
|
|
30
|
-
const
|
|
31
|
-
const
|
|
29
|
+
exports.registerTransformHook = exports.transformCode = void 0;
|
|
30
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
31
|
+
const pirates_1 = require("pirates");
|
|
32
32
|
const logger = __importStar(require("./logger"));
|
|
33
|
-
const
|
|
34
|
-
const
|
|
35
|
-
const
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
33
|
+
const TESTPLANE_TRANSFORM_HOOK = Symbol.for("testplane.transform.hook");
|
|
34
|
+
const TRANSFORM_EXTENSIONS = [".js", ".jsx", ".ts", ".tsx", ".mjs", ".cjs", ".mts", ".cts"];
|
|
35
|
+
const ASSET_EXTENSIONS = [
|
|
36
|
+
".css",
|
|
37
|
+
".scss",
|
|
38
|
+
".sass",
|
|
39
|
+
".less",
|
|
40
|
+
".styl",
|
|
41
|
+
".png",
|
|
42
|
+
".jpg",
|
|
43
|
+
".jpeg",
|
|
44
|
+
".gif",
|
|
45
|
+
".svg",
|
|
46
|
+
".woff",
|
|
47
|
+
".woff2",
|
|
48
|
+
];
|
|
49
|
+
let transformFunc = null;
|
|
50
|
+
const transformCode = (code, { sourceFile, sourceMaps, isSilent = true }) => {
|
|
51
|
+
if (transformFunc === null) {
|
|
52
|
+
const envVar = process.env.TS_NODE_SWC === "false" ? false : true;
|
|
53
|
+
const hasSwcCore = () => {
|
|
51
54
|
try {
|
|
52
|
-
require("@swc/core");
|
|
53
|
-
|
|
54
|
-
skipProject: JSON.parse(skipProjectRaw),
|
|
55
|
-
transpileOnly: JSON.parse(transpileOnlyRaw),
|
|
56
|
-
swc: true,
|
|
57
|
-
});
|
|
58
|
-
return;
|
|
59
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
55
|
+
require.resolve("@swc/core");
|
|
56
|
+
return true;
|
|
60
57
|
}
|
|
61
|
-
catch
|
|
58
|
+
catch {
|
|
62
59
|
if (!isSilent) {
|
|
63
|
-
|
|
64
|
-
logger.warn(`testplane: you may install @swc/core for significantly faster reading of typescript tests.`);
|
|
65
|
-
}
|
|
66
|
-
else {
|
|
67
|
-
const isSwcDebugLogEnabled = debug_1.default.enabled(swcDebugNamespace);
|
|
68
|
-
if (isSwcDebugLogEnabled) {
|
|
69
|
-
swcDebugLog(err);
|
|
70
|
-
}
|
|
71
|
-
else {
|
|
72
|
-
logger.warn(`testplane: could not load @swc/core. Run Testplane with "DEBUG=testplane:swc" to see details.`);
|
|
73
|
-
}
|
|
74
|
-
}
|
|
60
|
+
logger.warn(`testplane: you may install @swc/core for significantly faster reading of typescript tests.`);
|
|
75
61
|
}
|
|
62
|
+
return false;
|
|
76
63
|
}
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
64
|
+
};
|
|
65
|
+
if (envVar && hasSwcCore()) {
|
|
66
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
67
|
+
const { transformSync } = require("@swc/core");
|
|
68
|
+
transformFunc = (code, sourceFile, sourceMaps) => transformSync(code, {
|
|
69
|
+
sourceFileName: sourceFile,
|
|
70
|
+
sourceMaps: sourceMaps ? "inline" : false,
|
|
71
|
+
configFile: false,
|
|
72
|
+
swcrc: false,
|
|
73
|
+
minify: false,
|
|
74
|
+
module: {
|
|
75
|
+
type: "commonjs",
|
|
86
76
|
},
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
transpileOnly: JSON.parse(transpileOnlyRaw),
|
|
96
|
-
swc: false,
|
|
97
|
-
});
|
|
98
|
-
return;
|
|
99
|
-
// eslint-disable-next-line no-empty
|
|
77
|
+
jsc: {
|
|
78
|
+
target: "esnext",
|
|
79
|
+
parser: {
|
|
80
|
+
syntax: "typescript",
|
|
81
|
+
tsx: true,
|
|
82
|
+
},
|
|
83
|
+
},
|
|
84
|
+
}).code;
|
|
100
85
|
}
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
86
|
+
else {
|
|
87
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
88
|
+
const { transformSync } = require("esbuild");
|
|
89
|
+
transformFunc = (code, sourceFile, sourceMaps) => transformSync(code, {
|
|
90
|
+
sourcefile: sourceFile,
|
|
91
|
+
sourcemap: sourceMaps ? "inline" : false,
|
|
92
|
+
minify: false,
|
|
93
|
+
loader: node_path_1.default.extname(sourceFile).includes("j") ? "jsx" : "tsx",
|
|
94
|
+
format: "cjs",
|
|
95
|
+
target: "esnext",
|
|
96
|
+
jsx: "automatic",
|
|
97
|
+
}).code;
|
|
106
98
|
}
|
|
107
99
|
}
|
|
108
|
-
|
|
100
|
+
return transformFunc(code, sourceFile, sourceMaps);
|
|
101
|
+
};
|
|
102
|
+
exports.transformCode = transformCode;
|
|
103
|
+
const registerTransformHook = (isSilent = false) => {
|
|
104
|
+
const processWithEsbuildSymbol = process;
|
|
105
|
+
if (processWithEsbuildSymbol[TESTPLANE_TRANSFORM_HOOK] || process.env.TS_ENABLE === "false") {
|
|
106
|
+
return;
|
|
107
|
+
}
|
|
108
|
+
try {
|
|
109
|
+
const revertTransformHook = (0, pirates_1.addHook)((code, filename) => (0, exports.transformCode)(code, { sourceFile: filename, sourceMaps: false, isSilent }), {
|
|
110
|
+
exts: TRANSFORM_EXTENSIONS,
|
|
111
|
+
matcher: filename => !filename.includes("node_modules"),
|
|
112
|
+
ignoreNodeModules: false,
|
|
113
|
+
});
|
|
114
|
+
const revertAssetHook = (0, pirates_1.addHook)(() => "module.exports = {};", {
|
|
115
|
+
exts: ASSET_EXTENSIONS,
|
|
116
|
+
ignoreNodeModules: false,
|
|
117
|
+
});
|
|
118
|
+
const revertAll = () => {
|
|
119
|
+
revertTransformHook();
|
|
120
|
+
revertAssetHook();
|
|
121
|
+
delete processWithEsbuildSymbol[TESTPLANE_TRANSFORM_HOOK];
|
|
122
|
+
};
|
|
123
|
+
processWithEsbuildSymbol[TESTPLANE_TRANSFORM_HOOK] = { revert: revertAll };
|
|
124
|
+
}
|
|
125
|
+
catch (err) {
|
|
126
|
+
logger.warn(`testplane: an error occurred while trying to register transform hook.`, err);
|
|
127
|
+
}
|
|
109
128
|
};
|
|
110
|
-
exports.
|
|
129
|
+
exports.registerTransformHook = registerTransformHook;
|
|
111
130
|
//# sourceMappingURL=typescript.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../src/utils/typescript.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../src/utils/typescript.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ const RuntimeConfig = require("../config/runtime-config");
|
|
|
8
8
|
const { WorkerProcess } = require("./worker-process");
|
|
9
9
|
const logger = require("../utils/logger");
|
|
10
10
|
const { MASTER_INIT, MASTER_SYNC_CONFIG, WORKER_INIT, WORKER_SYNC_CONFIG, WORKER_UNHANDLED_REJECTION, } = require("../constants/process-messages");
|
|
11
|
+
const { isRunInNodeJsEnv } = require("./config");
|
|
11
12
|
module.exports = class WorkersRegistry extends EventEmitter {
|
|
12
13
|
static create(...args) {
|
|
13
14
|
return new WorkersRegistry(...args);
|
|
@@ -33,6 +34,10 @@ module.exports = class WorkersRegistry extends EventEmitter {
|
|
|
33
34
|
return this._ended;
|
|
34
35
|
}
|
|
35
36
|
register(workerFilepath, exportedMethods) {
|
|
37
|
+
// For some reason, preloading modules causes running tests to hang up in browser env
|
|
38
|
+
if (isRunInNodeJsEnv(this._config)) {
|
|
39
|
+
this._workerFarm.loadModule(workerFilepath, _.noop);
|
|
40
|
+
}
|
|
36
41
|
const workers = new EventEmitter();
|
|
37
42
|
this._registeredWorkers.push(workers);
|
|
38
43
|
for (const methodName of exportedMethods) {
|
|
@@ -40,7 +45,7 @@ module.exports = class WorkersRegistry extends EventEmitter {
|
|
|
40
45
|
if (this._ended) {
|
|
41
46
|
return Promise.reject(new Error(`Can't execute method '${methodName}' because worker farm ended.`));
|
|
42
47
|
}
|
|
43
|
-
return promisify(this._workerFarm)(workerFilepath, methodName, args);
|
|
48
|
+
return promisify(this._workerFarm.execute)(workerFilepath, methodName, args);
|
|
44
49
|
};
|
|
45
50
|
}
|
|
46
51
|
return workers;
|
|
@@ -56,7 +61,7 @@ module.exports = class WorkersRegistry extends EventEmitter {
|
|
|
56
61
|
onChild: child => this._initChild(child),
|
|
57
62
|
...this._inspectParams(),
|
|
58
63
|
};
|
|
59
|
-
return workerFarm(params, workerFilepath);
|
|
64
|
+
return workerFarm(params, workerFilepath, ["loadModule", "execute"]);
|
|
60
65
|
}
|
|
61
66
|
_inspectParams() {
|
|
62
67
|
const runtimeConfig = RuntimeConfig.getInstance();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workers-registry.js","sourceRoot":"","sources":["../../../src/utils/workers-registry.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC3C,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAC1C,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AACtC,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC5B,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AAC9C,MAAM,aAAa,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAC1D,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AACtD,MAAM,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAC1C,MAAM,EACF,WAAW,EACX,kBAAkB,EAClB,WAAW,EACX,kBAAkB,EAClB,0BAA0B,GAC7B,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"workers-registry.js","sourceRoot":"","sources":["../../../src/utils/workers-registry.js"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,8 @@ export declare class TestRunner extends NodejsEnvTestRunner {
|
|
|
10
10
|
private _isReconnected;
|
|
11
11
|
private _broInitResOnReconnect;
|
|
12
12
|
constructor(opts: WorkerTestRunnerCtorOpts);
|
|
13
|
-
|
|
13
|
+
prepareBrowser(opts: WorkerTestRunnerRunOpts): Promise<void>;
|
|
14
|
+
run(): Promise<WorkerRunTestResult>;
|
|
14
15
|
private _runWithAbort;
|
|
15
16
|
private _waitBroInitOnReconnect;
|
|
16
17
|
_getPreparePageActions(browser: Browser, history: BrowserHistory): (() => Promise<void>)[];
|
|
@@ -63,11 +63,14 @@ class TestRunner extends test_runner_1.default {
|
|
|
63
63
|
}
|
|
64
64
|
});
|
|
65
65
|
}
|
|
66
|
-
async
|
|
66
|
+
async prepareBrowser(opts) {
|
|
67
67
|
this._runOpts = opts;
|
|
68
|
+
return super.prepareBrowser(opts);
|
|
69
|
+
}
|
|
70
|
+
async run() {
|
|
68
71
|
let error;
|
|
69
72
|
try {
|
|
70
|
-
await super.prepareToRun(
|
|
73
|
+
await super.prepareToRun();
|
|
71
74
|
error = await this._runWithAbort(throwIfAborted => {
|
|
72
75
|
const ExecutionThreadCls = (0, execution_thread_1.wrapExecutionThread)(this._socket, throwIfAborted);
|
|
73
76
|
return super.runRunnables(ExecutionThreadCls);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/worker/browser-env/runner/test-runner/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAiC;AACjC,oDAAuB;AACvB,uDAAsC;AACtC,wDAA+B;AAE/B,uDAA2D;AAC3D,8EAA8D;AAC9D,yDAAyD;AACzD,mCAA2C;AAC3C,2CAKqB;AACrB,6EAAwG;AACxG,iEAAmD;AACnD,uFAA8D;AAC9D,0FAAoF;AAEpF,qEAA8E;AAc9E,MAAM,WAAW,GAAG,CAAI,IAAO,EAAK,EAAE;IAClC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC9E,CAAC,CAAC;AAEF,MAAa,UAAW,SAAQ,qBAAmB;IAO/C,YAAY,IAA8B;QACtC,KAAK,CAAC,IAAI,CAAC,CAAC;QANR,aAAQ,GAAW,qBAAM,CAAC,UAAU,EAAE,CAAC;QAEvC,mBAAc,GAAY,KAAK,CAAC;QAChC,2BAAsB,GAAmB,IAAI,CAAC;QAKlD,IAAI,CAAC,OAAO,GAAG,IAAA,qBAAE,EAAC,wBAAa,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE;YACvD,UAAU,EAAE,CAAC,WAAW,CAAC;YACzB,IAAI,EAAE;gBACF,OAAO,EAAE,IAAI,CAAC,QAAQ;gBACtB,IAAI,EAAE,+BAAmB;aAC5B;SACJ,CAAqB,CAAC;QAEvB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,eAAe,EAAE,GAAG,CAAC,EAAE;YACnC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;gBACvB,MAAM,CAAC,IAAI,CACP,mBAAmB,OAAO,CAAC,GAAG,gBAAgB,IAAI,CAAC,QAAQ,yCAAyC,EACpG,GAAG,CACN,CAAC;YACN,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/worker/browser-env/runner/test-runner/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,32 @@
|
|
|
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
|
+
};
|
|
2
25
|
const { AsyncEmitter } = require("../../events/async-emitter");
|
|
3
26
|
const { passthroughEvent } = require("../../events/utils");
|
|
4
27
|
const { WorkerEvents } = require("../../events");
|
|
5
28
|
const BrowserPool = require("./browser-pool");
|
|
6
29
|
const { BrowserAgent } = require("./browser-agent");
|
|
7
|
-
const NodejsEnvTestRunner = require("./test-runner");
|
|
8
|
-
const { TestRunner: BrowserEnvTestRunner } = require("../browser-env/runner/test-runner");
|
|
9
30
|
const { CachingTestParser } = require("./caching-test-parser");
|
|
10
31
|
const { isRunInNodeJsEnv } = require("../../utils/config");
|
|
11
32
|
module.exports = class Runner extends AsyncEmitter {
|
|
@@ -24,17 +45,21 @@ module.exports = class Runner extends AsyncEmitter {
|
|
|
24
45
|
]);
|
|
25
46
|
}
|
|
26
47
|
async runTest(fullTitle, { browserId, browserVersion, file, sessionId, sessionCaps, sessionOpts, state, attempt }) {
|
|
27
|
-
const tests = await this._testParser.parse({ file, browserId });
|
|
28
|
-
const test = tests.find(t => t.fullTitle() === fullTitle);
|
|
29
48
|
const browserAgent = BrowserAgent.create({ id: browserId, version: browserVersion, pool: this._browserPool });
|
|
30
|
-
const
|
|
31
|
-
test
|
|
49
|
+
const RunnerClass = isRunInNodeJsEnv(this._config)
|
|
50
|
+
? await Promise.resolve().then(() => __importStar(require("./test-runner"))).then(m => m.default)
|
|
51
|
+
: await Promise.resolve().then(() => __importStar(require("../browser-env/runner/test-runner"))).then(m => m.TestRunner);
|
|
52
|
+
const runner = RunnerClass.create({
|
|
32
53
|
file,
|
|
33
54
|
config: this._config.forBrowser(browserId),
|
|
34
55
|
browserAgent,
|
|
35
56
|
attempt,
|
|
36
57
|
});
|
|
37
|
-
|
|
58
|
+
runner.prepareBrowser({ sessionId, sessionCaps, sessionOpts, state });
|
|
59
|
+
const tests = await this._testParser.parse({ file, browserId });
|
|
60
|
+
const test = tests.find(t => t.fullTitle() === fullTitle);
|
|
61
|
+
runner.assignTest(test);
|
|
62
|
+
return runner.run();
|
|
38
63
|
}
|
|
39
64
|
};
|
|
40
65
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/worker/runner/index.js"],"names":[],"mappings":"AAAA,YAAY,CAAC
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/worker/runner/index.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;AAEb,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAC/D,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAC3D,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AACjD,MAAM,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAC9C,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AACpD,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAC/D,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAE3D,MAAM,CAAC,OAAO,GAAG,MAAM,MAAO,SAAQ,YAAY;IAC9C,MAAM,CAAC,MAAM,CAAC,MAAM;QAChB,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,YAAY,MAAM;QACd,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAE3D,IAAI,CAAC,WAAW,GAAG,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACpD,gBAAgB,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE;YACrC,YAAY,CAAC,gBAAgB;YAC7B,YAAY,CAAC,eAAe;YAC5B,YAAY,CAAC,gBAAgB;SAChC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE;QAC7G,MAAM,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QAC9G,MAAM,WAAW,GAAG,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC;YAC9C,CAAC,CAAC,MAAM,kDAAO,eAAe,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YACpD,CAAC,CAAC,MAAM,kDAAO,mCAAmC,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAEhF,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;YAC9B,IAAI;YACJ,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC;YAC1C,YAAY;YACZ,OAAO;SACV,CAAC,CAAC;QAEH,MAAM,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;QAEtE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAChE,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,KAAK,SAAS,CAAC,CAAC;QAE1D,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAExB,OAAO,MAAM,CAAC,GAAG,EAAE,CAAC;IACxB,CAAC;CACJ,CAAC"}
|
|
@@ -1,10 +1,6 @@
|
|
|
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.SimpleTestParser = void 0;
|
|
7
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
8
4
|
const events_1 = require("events");
|
|
9
5
|
const utils_1 = require("../../events/utils");
|
|
10
6
|
const test_parser_1 = require("../../test-reader/test-parser");
|
|
@@ -18,10 +14,7 @@ class SimpleTestParser extends events_1.EventEmitter {
|
|
|
18
14
|
this._config = config;
|
|
19
15
|
}
|
|
20
16
|
async parse({ file, browserId }) {
|
|
21
|
-
const
|
|
22
|
-
? this._config.system.testRunEnv[0]
|
|
23
|
-
: this._config.system.testRunEnv;
|
|
24
|
-
const parser = new test_parser_1.TestParser({ testRunEnv });
|
|
17
|
+
const parser = new test_parser_1.TestParser();
|
|
25
18
|
(0, utils_1.passthroughEvent)(parser, this, [events_2.WorkerEvents.BEFORE_FILE_READ, events_2.WorkerEvents.AFTER_FILE_READ]);
|
|
26
19
|
await parser.loadFiles([file], { config: this._config });
|
|
27
20
|
return parser.parse([file], { browserId, config: this._config.forBrowser(browserId) });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simple-test-parser.js","sourceRoot":"","sources":["../../../../src/worker/runner/simple-test-parser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"simple-test-parser.js","sourceRoot":"","sources":["../../../../src/worker/runner/simple-test-parser.ts"],"names":[],"mappings":";;;AACA,mCAAsC;AACtC,8CAAsD;AACtD,+DAA2D;AAC3D,yCAA4C;AAQ5C,MAAa,gBAAiB,SAAQ,qBAAY;IAG9C,MAAM,CAAC,MAAM,CAGT,GAAG,IAAoD;QAEvD,OAAO,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,YAAY,MAAc;QACtB,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,SAAS,EAAa;QACtC,MAAM,MAAM,GAAG,IAAI,wBAAU,EAAE,CAAC;QAEhC,IAAA,wBAAgB,EAAC,MAAM,EAAE,IAAI,EAAE,CAAC,qBAAY,CAAC,gBAAgB,EAAE,qBAAY,CAAC,eAAe,CAAC,CAAC,CAAC;QAE9F,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAEzD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAC3F,CAAC;CACJ;AA1BD,4CA0BC"}
|
|
@@ -13,23 +13,22 @@ declare class TestRunner {
|
|
|
13
13
|
_config: any;
|
|
14
14
|
_browserAgent: any;
|
|
15
15
|
_attempt: any;
|
|
16
|
-
|
|
16
|
+
assignTest(test: any): void;
|
|
17
|
+
prepareBrowser({ sessionId, sessionCaps, sessionOpts, state }: {
|
|
17
18
|
sessionId: any;
|
|
18
19
|
sessionCaps: any;
|
|
19
20
|
sessionOpts: any;
|
|
20
21
|
state: any;
|
|
21
|
-
}): Promise<
|
|
22
|
+
}): Promise<void>;
|
|
23
|
+
_browserIsSettled: Promise<any> | undefined;
|
|
24
|
+
_browser: any;
|
|
25
|
+
_getBrowserException: any;
|
|
26
|
+
run(): Promise<{
|
|
22
27
|
testplaneCtx: any;
|
|
23
28
|
hermioneCtx: any;
|
|
24
29
|
meta: any;
|
|
25
30
|
}>;
|
|
26
|
-
prepareToRun(
|
|
27
|
-
sessionId: any;
|
|
28
|
-
sessionCaps: any;
|
|
29
|
-
sessionOpts: any;
|
|
30
|
-
state: any;
|
|
31
|
-
}): Promise<void>;
|
|
32
|
-
_browser: any;
|
|
31
|
+
prepareToRun(): Promise<void>;
|
|
33
32
|
finishRun(error: any): Promise<{
|
|
34
33
|
testplaneCtx: any;
|
|
35
34
|
hermioneCtx: any;
|
|
@@ -15,26 +15,46 @@ module.exports = class TestRunner {
|
|
|
15
15
|
return new this(...args);
|
|
16
16
|
}
|
|
17
17
|
constructor({ test, file, config, browserAgent, attempt }) {
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
if (test) {
|
|
19
|
+
this._test = test.clone();
|
|
20
|
+
this._test.testplaneCtx = _.cloneDeep(test.testplaneCtx) || {};
|
|
21
|
+
}
|
|
20
22
|
this._file = file;
|
|
21
23
|
this._config = config;
|
|
22
24
|
this._browserAgent = browserAgent;
|
|
23
25
|
this._attempt = attempt;
|
|
24
26
|
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
+
assignTest(test) {
|
|
28
|
+
this._test = test.clone();
|
|
29
|
+
this._test.testplaneCtx = _.cloneDeep(test.testplaneCtx) || {};
|
|
30
|
+
}
|
|
31
|
+
async prepareBrowser({ sessionId, sessionCaps, sessionOpts, state }) {
|
|
32
|
+
this._browserIsSettled = new Promise(resolve => {
|
|
33
|
+
this._browserAgent
|
|
34
|
+
.getBrowser({ sessionId, sessionCaps, sessionOpts, state })
|
|
35
|
+
.then(browser => {
|
|
36
|
+
this._browser = browser;
|
|
37
|
+
})
|
|
38
|
+
.catch(err => {
|
|
39
|
+
this._getBrowserException = err;
|
|
40
|
+
})
|
|
41
|
+
.finally(resolve);
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
async run() {
|
|
45
|
+
await this.prepareToRun();
|
|
27
46
|
const error = await this.runRunnables(ExecutionThread);
|
|
28
47
|
return this.finishRun(error);
|
|
29
48
|
}
|
|
30
49
|
// TODO: make it protected
|
|
31
|
-
async prepareToRun(
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
50
|
+
async prepareToRun() {
|
|
51
|
+
await this._browserIsSettled;
|
|
52
|
+
if (!this._test) {
|
|
53
|
+
throw new Error("Test is not assigned");
|
|
35
54
|
}
|
|
36
|
-
|
|
37
|
-
|
|
55
|
+
if (this._getBrowserException) {
|
|
56
|
+
const testplaneCtx = this._test.testplaneCtx;
|
|
57
|
+
throw Object.assign(this._getBrowserException, { testplaneCtx, hermioneCtx: testplaneCtx });
|
|
38
58
|
}
|
|
39
59
|
}
|
|
40
60
|
// TODO: make it protected
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/worker/runner/test-runner/index.js"],"names":[],"mappings":"AAAA,qBAAqB;AACrB,YAAY,CAAC;AAEb,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC5B,MAAM,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAC5C,MAAM,eAAe,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AACtD,MAAM,oBAAoB,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AACjE,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,gEAAgE,CAAC,CAAC;AACtG,MAAM,OAAO,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AACpD,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;AACnE,MAAM,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,mCAAmC,CAAC,CAAC;AAChF,MAAM,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;AACrE,MAAM,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAE9D,MAAM,CAAC,OAAO,GAAG,MAAM,UAAU;IAC7B,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI;QACjB,OAAO,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE;QACrD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/worker/runner/test-runner/index.js"],"names":[],"mappings":"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"}
|