testplane 8.25.2 → 8.25.3
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 +4 -3
- package/build/src/browser/browser.d.ts +4 -2
- package/build/src/browser/browser.js +29 -2
- package/build/src/browser/browser.js.map +1 -1
- package/build/src/browser/calibrator.d.ts +18 -16
- package/build/src/browser/calibrator.js +43 -50
- package/build/src/browser/calibrator.js.map +1 -1
- package/build/src/browser/camera/index.d.ts +29 -13
- package/build/src/browser/camera/index.js +37 -8
- package/build/src/browser/camera/index.js.map +1 -1
- package/build/src/browser/camera/utils.d.ts +2 -1
- package/build/src/browser/camera/utils.js +4 -11
- package/build/src/browser/camera/utils.js.map +1 -1
- package/build/src/browser/client-bridge/client-bridge.d.ts +11 -11
- package/build/src/browser/client-bridge/client-bridge.js +21 -16
- package/build/src/browser/client-bridge/client-bridge.js.map +1 -1
- package/build/src/browser/client-bridge/index.d.ts +7 -2
- package/build/src/browser/client-bridge/index.js +16 -10
- package/build/src/browser/client-bridge/index.js.map +1 -1
- package/build/src/browser/commands/assert-view/errors/image-diff-error.js +2 -5
- package/build/src/browser/commands/assert-view/errors/image-diff-error.js.map +1 -1
- package/build/src/browser/commands/assert-view/index.js +1 -1
- package/build/src/browser/commands/assert-view/index.js.map +1 -1
- package/build/src/browser/commands/clearSession.js +24 -4
- package/build/src/browser/commands/clearSession.js.map +1 -1
- package/build/src/browser/commands/index.d.ts +1 -2
- package/build/src/browser/commands/index.js +3 -1
- package/build/src/browser/commands/index.js.map +1 -1
- package/build/src/browser/commands/switchToRepl.js +26 -3
- package/build/src/browser/commands/switchToRepl.js.map +1 -1
- package/build/src/browser/existing-browser.d.ts +61 -159
- package/build/src/browser/existing-browser.js +114 -74
- package/build/src/browser/existing-browser.js.map +1 -1
- package/build/src/browser/history/callstack.d.ts +9 -8
- package/build/src/browser/history/callstack.js +28 -17
- package/build/src/browser/history/callstack.js.map +1 -1
- package/build/src/browser/history/index.d.ts +5 -4
- package/build/src/browser/history/index.js +102 -64
- package/build/src/browser/history/index.js.map +1 -1
- package/build/src/browser/history/utils.d.ts +11 -8
- package/build/src/browser/history/utils.js +23 -14
- package/build/src/browser/history/utils.js.map +1 -1
- package/build/src/browser/stacktrace/index.js +1 -1
- package/build/src/browser/stacktrace/index.js.map +1 -1
- package/build/src/browser/stacktrace/utils.d.ts +1 -1
- package/build/src/browser/stacktrace/utils.js +27 -4
- package/build/src/browser/stacktrace/utils.js.map +1 -1
- package/build/src/browser/types.d.ts +1 -1
- package/build/src/browser-installer/registry/index.js +4 -4
- package/build/src/browser-installer/registry/index.js.map +1 -1
- package/build/src/browser-installer/ubuntu-packages/index.js +25 -2
- package/build/src/browser-installer/ubuntu-packages/index.js.map +1 -1
- package/build/src/browser-pool/basic-pool.js +1 -1
- package/build/src/browser-pool/basic-pool.js.map +1 -1
- package/build/src/bundle/@wdio-utils.d.ts +1 -1
- package/build/src/cli/commands/config/index.js +24 -4
- package/build/src/cli/commands/config/index.js.map +1 -1
- package/build/src/cli/commands/install-deps/index.js +25 -5
- package/build/src/cli/commands/install-deps/index.js.map +1 -1
- package/build/src/cli/commands/list-browsers/index.js +25 -2
- package/build/src/cli/commands/list-browsers/index.js.map +1 -1
- package/build/src/cli/commands/list-tests/index.js +30 -6
- package/build/src/cli/commands/list-tests/index.js.map +1 -1
- package/build/src/cli/index.js +28 -5
- package/build/src/cli/index.js.map +1 -1
- package/build/src/config/index.js +2 -2
- package/build/src/config/index.js.map +1 -1
- package/build/src/config/types.d.ts +1 -1
- package/build/src/constants/help.d.ts +1 -0
- package/build/src/constants/help.js +5 -0
- package/build/src/constants/help.js.map +1 -0
- package/build/src/dev-server/index.js +24 -1
- package/build/src/dev-server/index.js.map +1 -1
- package/build/src/dev-server/utils.js +30 -7
- package/build/src/dev-server/utils.js.map +1 -1
- package/build/src/error-snippets/frames.js +25 -2
- package/build/src/error-snippets/frames.js.map +1 -1
- package/build/src/image.d.ts +52 -53
- package/build/src/image.js +29 -23
- package/build/src/image.js.map +1 -1
- package/build/src/runner/browser-env/vite/browser-modules/tsconfig.tsbuildinfo +1 -1
- package/build/src/runner/browser-env/vite/plugins/generate-index-html.js +25 -2
- package/build/src/runner/browser-env/vite/plugins/generate-index-html.js.map +1 -1
- package/build/src/runner/browser-env/vite/plugins/mock.js +26 -3
- package/build/src/runner/browser-env/vite/plugins/mock.js.map +1 -1
- package/build/src/runner/browser-env/vite/server.js +2 -2
- package/build/src/runner/browser-env/vite/server.js.map +1 -1
- package/build/src/test-reader/test-parser.js +25 -2
- package/build/src/test-reader/test-parser.js.map +1 -1
- package/build/src/testplane.js +26 -3
- package/build/src/testplane.js.map +1 -1
- package/build/src/types/index.d.ts +2 -1
- package/build/src/types/index.js.map +1 -1
- package/build/src/utils/cli.js +25 -2
- package/build/src/utils/cli.js.map +1 -1
- package/build/src/utils/logger.d.ts +3 -3
- package/build/src/utils/logger.js +11 -8
- package/build/src/utils/logger.js.map +1 -1
- package/build/src/utils/page-loader.js +27 -4
- package/build/src/utils/page-loader.js.map +1 -1
- package/build/src/utils/typescript.js +27 -4
- package/build/src/utils/typescript.js.map +1 -1
- package/build/src/validators.js +25 -2
- package/build/src/validators.js.map +1 -1
- package/build/src/worker/browser-env/runner/test-runner/index.js +2 -2
- package/build/src/worker/browser-env/runner/test-runner/index.js.map +1 -1
- package/build/src/worker/runner/browser-agent.d.ts +1 -1
- package/build/src/worker/runner/browser-pool.d.ts +3 -2
- package/build/src/worker/runner/browser-pool.js +3 -3
- package/build/src/worker/runner/browser-pool.js.map +1 -1
- package/build/src/worker/runner/test-runner/one-time-screenshooter.d.ts +1 -4
- package/build/src/worker/runner/test-runner/one-time-screenshooter.js +1 -1
- package/build/src/worker/runner/test-runner/one-time-screenshooter.js.map +1 -1
- package/package.json +4 -3
|
@@ -1,69 +1,104 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
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
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.initCommandHistory = exports.runGroup = exports.shouldPropagateFn = void 0;
|
|
27
|
+
const callstack_1 = require("./callstack");
|
|
28
|
+
const cmds = __importStar(require("./commands"));
|
|
29
|
+
const utils_1 = require("./utils");
|
|
30
|
+
const types_1 = require("../../types");
|
|
31
|
+
const shouldNotWrapCommand = (commandName) => ["addCommand", "overwriteCommand", "extendOptions", "setMeta", "getMeta", "runStep"].includes(commandName);
|
|
32
|
+
const shouldPropagateFn = (parentNode, currentNode) => (0, utils_1.isGroup)(parentNode) || (0, utils_1.isGroup)(currentNode);
|
|
33
|
+
exports.shouldPropagateFn = shouldPropagateFn;
|
|
7
34
|
const mkHistoryNode = ({ name, args, elementScope, key, overwrite, isGroup }) => {
|
|
8
35
|
const map = {
|
|
9
|
-
[TestStepKey.Name]: name,
|
|
10
|
-
[TestStepKey.Args]: normalizeCommandArgs(name, args),
|
|
11
|
-
[TestStepKey.Scope]: cmds.createScope(elementScope),
|
|
12
|
-
[TestStepKey.Key]: key,
|
|
36
|
+
[types_1.TestStepKey.Name]: name,
|
|
37
|
+
[types_1.TestStepKey.Args]: (0, utils_1.normalizeCommandArgs)(name, args),
|
|
38
|
+
[types_1.TestStepKey.Scope]: cmds.createScope(elementScope),
|
|
39
|
+
[types_1.TestStepKey.Key]: key ?? Symbol(),
|
|
13
40
|
};
|
|
14
41
|
if (overwrite) {
|
|
15
|
-
map[TestStepKey.IsOverwritten] =
|
|
42
|
+
map[types_1.TestStepKey.IsOverwritten] = Boolean(overwrite);
|
|
16
43
|
}
|
|
17
44
|
if (isGroup) {
|
|
18
|
-
map[TestStepKey.IsGroup] = true;
|
|
45
|
+
map[types_1.TestStepKey.IsGroup] = true;
|
|
19
46
|
}
|
|
20
47
|
return map;
|
|
21
48
|
};
|
|
22
49
|
const runWithHistoryHooks = ({ callstack, nodeData, fn }) => {
|
|
23
|
-
nodeData.key = nodeData.key
|
|
24
|
-
return runWithHooks({
|
|
50
|
+
nodeData.key = nodeData.key ?? Symbol();
|
|
51
|
+
return (0, utils_1.runWithHooks)({
|
|
25
52
|
before: () => callstack.enter(mkHistoryNode(nodeData)),
|
|
26
53
|
fn,
|
|
27
54
|
after: () => callstack.leave(nodeData.key),
|
|
28
55
|
error: () => callstack.markError(exports.shouldPropagateFn),
|
|
29
56
|
});
|
|
30
57
|
};
|
|
31
|
-
const overwriteAddCommand = (session, callstack) =>
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
});
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
return
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
58
|
+
const overwriteAddCommand = (session, callstack) => {
|
|
59
|
+
session.overwriteCommand("addCommand", (origCommand, name, wrapper, elementScope) => {
|
|
60
|
+
if (shouldNotWrapCommand(name)) {
|
|
61
|
+
return origCommand(name, wrapper, elementScope);
|
|
62
|
+
}
|
|
63
|
+
function decoratedWrapper(...args) {
|
|
64
|
+
return runWithHistoryHooks({
|
|
65
|
+
callstack,
|
|
66
|
+
nodeData: { name, args, elementScope, overwrite: false },
|
|
67
|
+
fn: () => wrapper.apply(this, args),
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
return origCommand(name, decoratedWrapper, elementScope);
|
|
71
|
+
});
|
|
72
|
+
};
|
|
73
|
+
const overwriteOverwriteCommand = (session, callstack) => {
|
|
74
|
+
session.overwriteCommand("overwriteCommand", (origCommand, name, wrapper, elementScope) => {
|
|
75
|
+
if (shouldNotWrapCommand(name)) {
|
|
76
|
+
return origCommand(name, wrapper, elementScope);
|
|
77
|
+
}
|
|
78
|
+
function decoratedWrapper(origFn, ...args) {
|
|
79
|
+
return runWithHistoryHooks({
|
|
80
|
+
callstack,
|
|
81
|
+
nodeData: { name, args, elementScope, overwrite: true },
|
|
82
|
+
fn: () => wrapper.apply(this, [origFn, ...args]),
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
86
|
+
return origCommand(name, decoratedWrapper, elementScope);
|
|
87
|
+
});
|
|
88
|
+
};
|
|
89
|
+
const overwriteCommands = ({ session, callstack, commands, elementScope }) => {
|
|
90
|
+
commands.forEach(name => {
|
|
91
|
+
function decoratedWrapper(origFn, ...args) {
|
|
92
|
+
return runWithHistoryHooks({
|
|
93
|
+
callstack,
|
|
94
|
+
nodeData: { name, args, elementScope, overwrite: false },
|
|
95
|
+
fn: () => origFn(...args),
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
99
|
+
session.overwriteCommand(name, decoratedWrapper, elementScope);
|
|
100
|
+
});
|
|
101
|
+
};
|
|
67
102
|
const overwriteBrowserCommands = (session, callstack) => overwriteCommands({
|
|
68
103
|
session,
|
|
69
104
|
callstack,
|
|
@@ -76,27 +111,30 @@ const overwriteElementCommands = (session, callstack) => overwriteCommands({
|
|
|
76
111
|
commands: cmds.getElementCommands(),
|
|
77
112
|
elementScope: true,
|
|
78
113
|
});
|
|
79
|
-
const
|
|
80
|
-
return exports.runGroup(callstack, stepName, () => origCommand(stepName, stepCb));
|
|
81
|
-
});
|
|
82
|
-
exports.initCommandHistory = session => {
|
|
83
|
-
const callstack = new Callstack();
|
|
84
|
-
overwriteAddCommand(session, callstack);
|
|
85
|
-
overwriteBrowserCommands(session, callstack);
|
|
86
|
-
overwriteElementCommands(session, callstack);
|
|
87
|
-
overwriteOverwriteCommand(session, callstack);
|
|
88
|
-
overwriteRunStepCommand(session, callstack);
|
|
89
|
-
return callstack;
|
|
90
|
-
};
|
|
91
|
-
exports.runGroup = (callstack, name, fn) => {
|
|
114
|
+
const runGroup = (callstack, name, fn) => {
|
|
92
115
|
if (!callstack) {
|
|
93
116
|
return fn();
|
|
94
117
|
}
|
|
95
118
|
return runWithHistoryHooks({
|
|
96
119
|
callstack,
|
|
97
|
-
nodeData: { name, isGroup: true },
|
|
120
|
+
nodeData: { name, args: [], isGroup: true },
|
|
98
121
|
fn,
|
|
99
122
|
});
|
|
100
123
|
};
|
|
101
|
-
exports.
|
|
124
|
+
exports.runGroup = runGroup;
|
|
125
|
+
const overwriteRunStepCommand = (session, callstack) => {
|
|
126
|
+
session.overwriteCommand("runStep", (origCommand, stepName, stepCb) => {
|
|
127
|
+
return (0, exports.runGroup)(callstack, stepName, () => origCommand(stepName, stepCb));
|
|
128
|
+
});
|
|
129
|
+
};
|
|
130
|
+
const initCommandHistory = (session) => {
|
|
131
|
+
const callstack = new callstack_1.Callstack();
|
|
132
|
+
overwriteAddCommand(session, callstack);
|
|
133
|
+
overwriteBrowserCommands(session, callstack);
|
|
134
|
+
overwriteElementCommands(session, callstack);
|
|
135
|
+
overwriteOverwriteCommand(session, callstack);
|
|
136
|
+
overwriteRunStepCommand(session, callstack);
|
|
137
|
+
return callstack;
|
|
138
|
+
};
|
|
139
|
+
exports.initCommandHistory = initCommandHistory;
|
|
102
140
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/browser/history/index.
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/browser/history/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
1
|
+
import { TestStep } from "../../types";
|
|
2
|
+
type HookFunctions<T> = {
|
|
3
|
+
fn: () => T;
|
|
4
|
+
before: () => void;
|
|
5
|
+
after: () => void;
|
|
6
|
+
error: (err: unknown) => unknown;
|
|
7
|
+
};
|
|
8
|
+
export declare const normalizeCommandArgs: (commandName: string, args?: unknown[]) => string[];
|
|
9
|
+
export declare const isGroup: (node: TestStep) => boolean;
|
|
10
|
+
export declare const runWithHooks: <T>({ fn, before, after, error }: HookFunctions<T>) => T;
|
|
11
|
+
export {};
|
|
@@ -1,24 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
|
|
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.runWithHooks = exports.isGroup = exports.normalizeCommandArgs = void 0;
|
|
7
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
8
|
+
const types_1 = require("../../types");
|
|
4
9
|
const MAX_STRING_LENGTH = 50;
|
|
5
|
-
|
|
6
|
-
if (
|
|
10
|
+
const normalizeCommandArgs = (commandName, args = []) => {
|
|
11
|
+
if (commandName === "execute") {
|
|
7
12
|
return ["code"];
|
|
8
13
|
}
|
|
9
14
|
return args.map(arg => {
|
|
10
|
-
if (
|
|
11
|
-
return
|
|
15
|
+
if (typeof arg === "string") {
|
|
16
|
+
return lodash_1.default.truncate(arg, { length: MAX_STRING_LENGTH });
|
|
12
17
|
}
|
|
13
|
-
if (
|
|
18
|
+
if (lodash_1.default.isPlainObject(arg)) {
|
|
14
19
|
return "obj";
|
|
15
20
|
}
|
|
16
|
-
return arg;
|
|
21
|
+
return String(arg);
|
|
17
22
|
});
|
|
18
23
|
};
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
24
|
+
exports.normalizeCommandArgs = normalizeCommandArgs;
|
|
25
|
+
const isPromise = (val) => typeof lodash_1.default.get(val, "then") === "function";
|
|
26
|
+
const isGroup = (node) => Boolean(node && node[types_1.TestStepKey.IsGroup]);
|
|
27
|
+
exports.isGroup = isGroup;
|
|
28
|
+
const runWithHooks = ({ fn, before, after, error }) => {
|
|
22
29
|
let isReturnedValuePromise = false;
|
|
23
30
|
before();
|
|
24
31
|
try {
|
|
@@ -26,19 +33,20 @@ exports.runWithHooks = ({ fn, before, after, error }) => {
|
|
|
26
33
|
if (isPromise(value)) {
|
|
27
34
|
isReturnedValuePromise = true;
|
|
28
35
|
return value
|
|
29
|
-
.catch(err => {
|
|
36
|
+
.catch((err) => {
|
|
30
37
|
error(err);
|
|
31
38
|
throw err;
|
|
32
39
|
})
|
|
33
|
-
.finally(after)
|
|
40
|
+
.finally(after)
|
|
41
|
+
.then(() => value); // It's valid to convert Promise to T since value is already Promise here
|
|
34
42
|
}
|
|
35
43
|
return value;
|
|
36
44
|
}
|
|
37
45
|
catch (err) {
|
|
38
46
|
if (!isReturnedValuePromise) {
|
|
39
47
|
error(err);
|
|
40
|
-
throw err;
|
|
41
48
|
}
|
|
49
|
+
throw err;
|
|
42
50
|
}
|
|
43
51
|
finally {
|
|
44
52
|
if (!isReturnedValuePromise) {
|
|
@@ -46,4 +54,5 @@ exports.runWithHooks = ({ fn, before, after, error }) => {
|
|
|
46
54
|
}
|
|
47
55
|
}
|
|
48
56
|
};
|
|
57
|
+
exports.runWithHooks = runWithHooks;
|
|
49
58
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/browser/history/utils.
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/browser/history/utils.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,uCAAoD;AAEpD,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAStB,MAAM,oBAAoB,GAAG,CAAC,WAAmB,EAAE,OAAkB,EAAE,EAAY,EAAE;IACxF,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;IAED,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAClB,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC1B,OAAO,gBAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAC;QAC1D,CAAC;QAED,IAAI,gBAAC,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAhBW,QAAA,oBAAoB,wBAgB/B;AAEF,MAAM,SAAS,GAAG,CAAC,GAAY,EAA2B,EAAE,CAAC,OAAO,gBAAC,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,UAAU,CAAC;AAE/F,MAAM,OAAO,GAAG,CAAC,IAAc,EAAW,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,mBAAW,CAAC,OAAO,CAAC,CAAC,CAAC;AAAlF,QAAA,OAAO,WAA2E;AAExF,MAAM,YAAY,GAAG,CAAI,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAoB,EAAK,EAAE;IACjF,IAAI,sBAAsB,GAAG,KAAK,CAAC;IAEnC,MAAM,EAAE,CAAC;IAET,IAAI,CAAC;QACD,MAAM,KAAK,GAAG,EAAE,EAAE,CAAC;QAEnB,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACnB,sBAAsB,GAAG,IAAI,CAAC;YAE9B,OAAO,KAAK;iBACP,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;gBACpB,KAAK,CAAC,GAAG,CAAC,CAAC;gBAEX,MAAM,GAAG,CAAC;YACd,CAAC,CAAC;iBACD,OAAO,CAAC,KAAK,CAAC;iBACd,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAM,CAAC,CAAC,yEAAyE;QAC1G,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC1B,KAAK,CAAC,GAAG,CAAC,CAAC;QACf,CAAC;QAED,MAAM,GAAG,CAAC;IACd,CAAC;YAAS,CAAC;QACP,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC1B,KAAK,EAAE,CAAC;QACZ,CAAC;IACL,CAAC;AACL,CAAC,CAAC;AAjCW,QAAA,YAAY,gBAiCvB"}
|
|
@@ -14,7 +14,7 @@ const runWithStacktraceHooks = ({ stackFrames, fn, stackFilterFunc, }) => {
|
|
|
14
14
|
before: () => stackFrames.enter(key, frames),
|
|
15
15
|
fn,
|
|
16
16
|
after: () => stackFrames.leave(key),
|
|
17
|
-
error:
|
|
17
|
+
error: err => (0, utils_1.applyStackTraceIfBetter)(err, frames),
|
|
18
18
|
});
|
|
19
19
|
};
|
|
20
20
|
exports.runWithStacktraceHooks = runWithStacktraceHooks;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/browser/stacktrace/index.ts"],"names":[],"mappings":";;;AAAA,mCAA6F;AAC7F,kDAA6E;AAC7E,4CAAgD;AAIzC,MAAM,sBAAsB,GAAG,CAAC,EACnC,WAAW,EACX,EAAE,EACF,eAAe,GAKlB,EAAyB,EAAE;IACxB,MAAM,MAAM,GAAG,IAAA,6BAAqB,EAAC,eAAe,IAAI,8BAAsB,CAAC,CAAC;IAEhF,IAAI,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;QAClC,OAAO,EAAE,EAAE,CAAC;IAChB,CAAC;IAED,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;IAEjC,OAAO,IAAA,oBAAY,EAAC;QAChB,MAAM,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC;QAC5C,EAAE;QACF,KAAK,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC;QACnC,KAAK,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/browser/stacktrace/index.ts"],"names":[],"mappings":";;;AAAA,mCAA6F;AAC7F,kDAA6E;AAC7E,4CAAgD;AAIzC,MAAM,sBAAsB,GAAG,CAAC,EACnC,WAAW,EACX,EAAE,EACF,eAAe,GAKlB,EAAyB,EAAE;IACxB,MAAM,MAAM,GAAG,IAAA,6BAAqB,EAAC,eAAe,IAAI,8BAAsB,CAAC,CAAC;IAEhF,IAAI,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;QAClC,OAAO,EAAE,EAAE,CAAC;IAChB,CAAC;IAED,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;IAEjC,OAAO,IAAA,oBAAY,EAAC;QAChB,MAAM,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC;QAC5C,EAAE;QACF,KAAK,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC;QACnC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,IAAA,+BAAuB,EAAC,GAAG,EAAE,MAAM,CAAC;KACrD,CAAC,CAAC;AACP,CAAC,CAAC;AAvBW,QAAA,sBAAsB,0BAuBjC;AAEF,MAAM,mBAAmB,GAAG,CAAC,OAA4B,EAAE,WAA+B,EAAQ,EAAE,CAChG,OAAO,CAAC,gBAAgB,CAAC,YAAY,EAAE,UAAgB,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY;IAE3F,SAAS,gBAAgB,CAAmB,GAAG,IAAe;QAC1D,OAAO,IAAA,8BAAsB,EAAC;YAC1B,WAAW;YACX,EAAE,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC;YACnC,eAAe,EAAE,gBAAgB;SACpC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE,YAAY,CAAC,CAAC;AACxE,CAAC,CAAC,CAAC;AAEP,MAAM,yBAAyB,GAAG,CAAC,OAA4B,EAAE,WAA+B,EAAQ,EAAE,CACtG,OAAO,CAAC,gBAAgB,CACpB,kBAAkB;AAClB,8DAA8D;AAC9D,UAAgB,WAAgB,EAAE,IAAI,EAAE,OAAgB,EAAE,YAAY;IAClE,SAAS,gBAAgB,CAAgB,MAAe,EAAE,GAAG,IAAe;QACxE,OAAO,IAAA,8BAAsB,EAAC;YAC1B,WAAW;YACX,EAAE,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;YAC7C,eAAe,EAAE,gBAAgB;SACpC,CAAC,CAAC;IACP,CAAC;IACD,OAAO,WAAW,CAAC,IAAI,CACnB,IAAI,EACJ,IAAI,EACJ,gBAIC,EACD,YAAY,CACf,CAAC;AACN,CAAC,CACJ,CAAC;AAEN,MAAM,iBAAiB,GAAG,CAAC,EACvB,OAAO,EACP,WAAW,EACX,QAAQ,EACR,YAAY,GAMf,EAAQ,EAAE,CACP,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;IACpB,SAAS,gBAAgB,CAAgB,MAAuC,EAAE,GAAG,IAAe;QAChG,OAAO,IAAA,8BAAsB,EAAC;YAC1B,WAAW;YACX,EAAE,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC;YAClC,eAAe,EAAE,gBAAgB;SACpC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,CAAC,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,EAAE,YAAY,CAAC,CAAC;AACnE,CAAC,CAAC,CAAC;AAEP,MAAM,wBAAwB,GAAG,CAAC,OAA4B,EAAE,WAA+B,EAAQ,EAAE,CACrG,iBAAiB,CAAC;IACd,OAAO;IACP,WAAW;IACX,QAAQ,EAAE,IAAA,6BAAkB,GAAE;IAC9B,YAAY,EAAE,KAAK;CACtB,CAAC,CAAC;AAEP,MAAM,wBAAwB,GAAG,CAAC,OAA4B,EAAE,WAA+B,EAAQ,EAAE,CACrG,iBAAiB,CAAC;IACd,OAAO;IACP,WAAW;IACX,QAAQ,EAAE,IAAA,6BAAkB,GAAE;IAC9B,YAAY,EAAE,IAAI;CACrB,CAAC,CAAC;AAEA,MAAM,kBAAkB,GAAG,CAAC,OAA4B,EAAQ,EAAE;IACrE,MAAM,WAAW,GAAG,IAAI,0BAAkB,EAAE,CAAC;IAE7C,mBAAmB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC1C,wBAAwB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC/C,wBAAwB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC/C,yBAAyB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;AACpD,CAAC,CAAC;AAPW,QAAA,kBAAkB,sBAO7B"}
|
|
@@ -18,7 +18,7 @@ export declare const FRAME_RELEVANCE: Record<string, {
|
|
|
18
18
|
matcher: (fileName: string) => boolean;
|
|
19
19
|
}>;
|
|
20
20
|
export declare const getFrameRelevance: (frame: StackFrame) => number;
|
|
21
|
-
export declare const applyStackTraceIfBetter: (error:
|
|
21
|
+
export declare const applyStackTraceIfBetter: <T>(error: T, stack: RawStackFrames) => T;
|
|
22
22
|
export declare const filterExtraStackFrames: (error: Error) => Error;
|
|
23
23
|
export declare class ShallowStackFrames {
|
|
24
24
|
private _framesMap;
|
|
@@ -1,4 +1,27 @@
|
|
|
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
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
@@ -6,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
29
|
exports.ShallowStackFrames = exports.filterExtraStackFrames = exports.applyStackTraceIfBetter = exports.getFrameRelevance = exports.FRAME_RELEVANCE = exports.captureRawStackFrames = exports.getErrorTitle = void 0;
|
|
7
30
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
31
|
const error_stack_parser_1 = __importDefault(require("error-stack-parser"));
|
|
9
|
-
const
|
|
32
|
+
const logger = __importStar(require("../../utils/logger"));
|
|
10
33
|
const fs_1 = require("../../utils/fs");
|
|
11
34
|
const constants_1 = require("./constants");
|
|
12
35
|
const getErrorTitle = (e) => {
|
|
@@ -106,7 +129,7 @@ const applyStackTrace = (error, stack) => {
|
|
|
106
129
|
return error;
|
|
107
130
|
};
|
|
108
131
|
const applyStackTraceIfBetter = (error, stack) => {
|
|
109
|
-
if (!error || !error.message) {
|
|
132
|
+
if (!error || !(error instanceof Error) || !error.message) {
|
|
110
133
|
return error;
|
|
111
134
|
}
|
|
112
135
|
try {
|
|
@@ -117,7 +140,7 @@ const applyStackTraceIfBetter = (error, stack) => {
|
|
|
117
140
|
}
|
|
118
141
|
}
|
|
119
142
|
catch (err) {
|
|
120
|
-
|
|
143
|
+
logger.warn("Couldn't compare error stack traces");
|
|
121
144
|
}
|
|
122
145
|
return error;
|
|
123
146
|
};
|
|
@@ -167,7 +190,7 @@ const filterExtraStackFrames = (error) => {
|
|
|
167
190
|
return applyStackTrace(error, framesFiltered);
|
|
168
191
|
}
|
|
169
192
|
catch (filterError) {
|
|
170
|
-
|
|
193
|
+
logger.warn("Couldn't filter out wdio frames", filterError);
|
|
171
194
|
return error;
|
|
172
195
|
}
|
|
173
196
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/browser/stacktrace/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/browser/stacktrace/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import type { BrowserConfig } from "./../config/browser-config";
|
|
|
6
6
|
import type { ExecutionThreadCtx, ExecutionThreadToolCtx } from "../types";
|
|
7
7
|
import { MoveCursorToCommand } from "./commands/moveCursorTo";
|
|
8
8
|
import { OpenAndWaitCommand } from "./commands/openAndWait";
|
|
9
|
-
import Callstack from "./history/callstack";
|
|
9
|
+
import type { Callstack } from "./history/callstack";
|
|
10
10
|
import { Test, Hook } from "../test-reader/test-object";
|
|
11
11
|
export declare const BrowserName: {
|
|
12
12
|
readonly CHROME: PuppeteerBrowser.CHROME;
|
|
@@ -31,7 +31,7 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
|
31
31
|
const path_1 = __importDefault(require("path"));
|
|
32
32
|
const utils_1 = require("../utils");
|
|
33
33
|
const utils_2 = require("../firefox/utils");
|
|
34
|
-
const
|
|
34
|
+
const logger = __importStar(require("../../utils/logger"));
|
|
35
35
|
const types_1 = require("../../browser/types");
|
|
36
36
|
const getRegistryBinaryKey = (name, platform) => `${name}_${platform}`;
|
|
37
37
|
const getRegistryOsPackagesKey = (name, version) => `${name}_${version}`;
|
|
@@ -40,11 +40,11 @@ const getCliProgressBar = lodash_1.default.once(async () => {
|
|
|
40
40
|
return createBrowserDownloadProgressBar();
|
|
41
41
|
});
|
|
42
42
|
const logDownloadingOsPackagesWarningOnce = lodash_1.default.once((osName) => {
|
|
43
|
-
|
|
43
|
+
logger.warn(`Downloading extra ${osName} packages`);
|
|
44
44
|
});
|
|
45
45
|
const logDownloadingBrowsersWarningOnce = lodash_1.default.once(() => {
|
|
46
|
-
|
|
47
|
-
|
|
46
|
+
logger.warn("Downloading Testplane browsers");
|
|
47
|
+
logger.warn("Note: this is one-time action. It may take a while...");
|
|
48
48
|
});
|
|
49
49
|
const getBuildPrefix = (browserName, browserVersion) => {
|
|
50
50
|
switch (browserName) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/browser-installer/registry/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,oDAAuB;AACvB,wDAA0B;AAC1B,gDAAwB;AACxB,oCAUkB;AAClB,4CAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/browser-installer/registry/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,27 @@
|
|
|
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
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
@@ -10,7 +33,7 @@ const path_1 = __importDefault(require("path"));
|
|
|
10
33
|
const utils_1 = require("../utils");
|
|
11
34
|
const apt_1 = require("./apt");
|
|
12
35
|
const utils_2 = require("./utils");
|
|
13
|
-
const
|
|
36
|
+
const logger = __importStar(require("../../utils/logger"));
|
|
14
37
|
const constants_1 = require("../constants");
|
|
15
38
|
const registry_1 = __importDefault(require("../registry"));
|
|
16
39
|
var utils_3 = require("./utils");
|
|
@@ -23,7 +46,7 @@ const readUbuntuPackageDependencies = async (ubuntuMilestone) => {
|
|
|
23
46
|
return await fs_extra_1.default.readJSON(getDependenciesArrayFilePath(ubuntuMilestone));
|
|
24
47
|
}
|
|
25
48
|
catch (_) {
|
|
26
|
-
|
|
49
|
+
logger.warn([
|
|
27
50
|
`Unable to read ubuntu dependencies for Ubuntu@${ubuntuMilestone}, as this version currently not supported`,
|
|
28
51
|
`Assuming all necessary packages are installed already`,
|
|
29
52
|
].join("\n"));
|