testplane 8.25.2 → 8.26.0-alpha.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 +4 -2
- package/build/src/browser/browser.d.ts +7 -5
- 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 +134 -84
- package/build/src/browser/existing-browser.js.map +1 -1
- package/build/src/browser/history/callstack.d.ts +13 -8
- package/build/src/browser/history/callstack.js +36 -17
- package/build/src/browser/history/callstack.js.map +1 -1
- package/build/src/browser/history/index.d.ts +15 -4
- package/build/src/browser/history/index.js +142 -68
- package/build/src/browser/history/index.js.map +1 -1
- package/build/src/browser/history/rrweb.d.ts +5 -0
- package/build/src/browser/history/rrweb.js +74 -0
- package/build/src/browser/history/rrweb.js.map +1 -0
- 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/new-browser.js +5 -1
- package/build/src/browser/new-browser.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/browser-options.js +25 -0
- package/build/src/config/browser-options.js.map +1 -1
- package/build/src/config/defaults.d.ts +2 -0
- package/build/src/config/defaults.js +2 -0
- package/build/src/config/defaults.js.map +1 -1
- package/build/src/config/index.d.ts +1 -0
- package/build/src/config/index.js +5 -3
- package/build/src/config/index.js.map +1 -1
- package/build/src/config/types.d.ts +13 -2
- package/build/src/config/types.js +12 -0
- package/build/src/config/types.js.map +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/events/index.d.ts +4 -0
- package/build/src/events/index.js +1 -0
- package/build/src/events/index.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/index.d.ts +1 -0
- package/build/src/index.js +3 -1
- package/build/src/index.js.map +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/runner/index.js +5 -1
- package/build/src/runner/index.js.map +1 -1
- package/build/src/runner/test-runner/insistant-test-runner.js +1 -1
- package/build/src/runner/test-runner/insistant-test-runner.js.map +1 -1
- package/build/src/runner/test-runner/regular-test-runner.d.ts +2 -2
- package/build/src/runner/test-runner/regular-test-runner.js +4 -3
- package/build/src/runner/test-runner/regular-test-runner.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 +13 -2
- 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/utils/workers-registry.js +4 -0
- package/build/src/utils/workers-registry.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 +7 -3
- 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/index.d.ts +2 -1
- package/build/src/worker/runner/index.js +2 -1
- package/build/src/worker/runner/index.js.map +1 -1
- package/build/src/worker/runner/test-runner/execution-thread.d.ts +3 -1
- package/build/src/worker/runner/test-runner/execution-thread.js +2 -1
- package/build/src/worker/runner/test-runner/execution-thread.js.map +1 -1
- package/build/src/worker/runner/test-runner/index.d.ts +3 -1
- package/build/src/worker/runner/test-runner/index.js +18 -4
- package/build/src/worker/runner/test-runner/index.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/build/src/worker/runner/test-runner/types.d.ts +2 -0
- package/build/src/worker/testplane.d.ts +1 -0
- package/build/src/worker/testplane.js.map +1 -1
- package/package.json +4 -2
|
@@ -1,102 +1,176 @@
|
|
|
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.runWithoutHistory = 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("../../config/types");
|
|
31
|
+
const types_2 = require("../../types");
|
|
32
|
+
const rrweb_1 = require("./rrweb");
|
|
33
|
+
const shouldNotWrapCommand = (commandName) => ["addCommand", "overwriteCommand", "extendOptions", "setMeta", "getMeta", "runStep"].includes(commandName);
|
|
34
|
+
const shouldPropagateFn = (parentNode, currentNode) => (0, utils_1.isGroup)(parentNode) || (0, utils_1.isGroup)(currentNode);
|
|
35
|
+
exports.shouldPropagateFn = shouldPropagateFn;
|
|
7
36
|
const mkHistoryNode = ({ name, args, elementScope, key, overwrite, isGroup }) => {
|
|
8
37
|
const map = {
|
|
9
|
-
[TestStepKey.Name]: name,
|
|
10
|
-
[TestStepKey.Args]: normalizeCommandArgs(name, args),
|
|
11
|
-
[TestStepKey.Scope]: cmds.createScope(elementScope),
|
|
12
|
-
[TestStepKey.Key]: key,
|
|
38
|
+
[types_2.TestStepKey.Name]: name,
|
|
39
|
+
[types_2.TestStepKey.Args]: (0, utils_1.normalizeCommandArgs)(name, args),
|
|
40
|
+
[types_2.TestStepKey.Scope]: cmds.createScope(elementScope ?? false),
|
|
41
|
+
[types_2.TestStepKey.Key]: key ?? Symbol(),
|
|
13
42
|
};
|
|
14
43
|
if (overwrite) {
|
|
15
|
-
map[TestStepKey.IsOverwritten] =
|
|
44
|
+
map[types_2.TestStepKey.IsOverwritten] = Boolean(overwrite);
|
|
16
45
|
}
|
|
17
46
|
if (isGroup) {
|
|
18
|
-
map[TestStepKey.IsGroup] = true;
|
|
47
|
+
map[types_2.TestStepKey.IsGroup] = true;
|
|
19
48
|
}
|
|
20
49
|
return map;
|
|
21
50
|
};
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
51
|
+
const runWithoutHistory = async ({ callstack }, fn) => {
|
|
52
|
+
callstack.setIsInBypassMode(true);
|
|
53
|
+
try {
|
|
54
|
+
return await fn();
|
|
55
|
+
}
|
|
56
|
+
finally {
|
|
57
|
+
callstack.setIsInBypassMode(false);
|
|
58
|
+
}
|
|
59
|
+
};
|
|
60
|
+
exports.runWithoutHistory = runWithoutHistory;
|
|
61
|
+
const runWithHistoryHooks = ({ session, callstack, nodeData, fn, config }) => {
|
|
62
|
+
nodeData.key = nodeData.key ?? Symbol();
|
|
63
|
+
if (callstack.isInBypassMode) {
|
|
64
|
+
return fn();
|
|
65
|
+
}
|
|
66
|
+
return (0, utils_1.runWithHooks)({
|
|
67
|
+
before: async () => {
|
|
68
|
+
const recordMode = config.record.mode;
|
|
69
|
+
const isRetry = (session.executionContext?.ctx?.attempt ?? 0) > 0;
|
|
70
|
+
const shouldRecord = recordMode !== types_1.RecordMode.Off && !(recordMode === types_1.RecordMode.OnForRetries && !isRetry);
|
|
71
|
+
let rrwebEvents = [];
|
|
72
|
+
if (shouldRecord && process.send && session.executionContext) {
|
|
73
|
+
rrwebEvents = await (0, rrweb_1.installRrwebAndCollectEvents)(session, callstack);
|
|
74
|
+
}
|
|
75
|
+
const rrwebEventsFiltered = (0, rrweb_1.filterEvents)(rrwebEvents);
|
|
76
|
+
(0, rrweb_1.sendFilteredEvents)(session, rrwebEventsFiltered);
|
|
77
|
+
callstack.enter(mkHistoryNode(nodeData));
|
|
78
|
+
},
|
|
26
79
|
fn,
|
|
27
80
|
after: () => callstack.leave(nodeData.key),
|
|
28
81
|
error: () => callstack.markError(exports.shouldPropagateFn),
|
|
29
82
|
});
|
|
30
83
|
};
|
|
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
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
})
|
|
67
|
-
|
|
84
|
+
const overwriteAddCommand = (session, callstack, config) => {
|
|
85
|
+
session.overwriteCommand("addCommand", (origCommand, name, wrapper, elementScope) => {
|
|
86
|
+
if (shouldNotWrapCommand(name)) {
|
|
87
|
+
return origCommand(name, wrapper, elementScope);
|
|
88
|
+
}
|
|
89
|
+
function decoratedWrapper(...args) {
|
|
90
|
+
return runWithHistoryHooks({
|
|
91
|
+
session,
|
|
92
|
+
callstack,
|
|
93
|
+
nodeData: { name, args, elementScope, overwrite: false },
|
|
94
|
+
fn: () => wrapper.apply(this, args),
|
|
95
|
+
config,
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
return origCommand(name, decoratedWrapper, elementScope);
|
|
99
|
+
});
|
|
100
|
+
};
|
|
101
|
+
const overwriteOverwriteCommand = (session, callstack, config) => {
|
|
102
|
+
session.overwriteCommand("overwriteCommand", (origCommand, name, wrapper, elementScope) => {
|
|
103
|
+
if (shouldNotWrapCommand(name)) {
|
|
104
|
+
return origCommand(name, wrapper, elementScope);
|
|
105
|
+
}
|
|
106
|
+
function decoratedWrapper(origFn, ...args) {
|
|
107
|
+
return runWithHistoryHooks({
|
|
108
|
+
session,
|
|
109
|
+
callstack,
|
|
110
|
+
nodeData: { name, args, elementScope, overwrite: true },
|
|
111
|
+
fn: () => wrapper.apply(this, [origFn, ...args]),
|
|
112
|
+
config,
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
116
|
+
return origCommand(name, decoratedWrapper, elementScope);
|
|
117
|
+
});
|
|
118
|
+
};
|
|
119
|
+
const overwriteCommands = ({ session, callstack, commands, elementScope, config }) => {
|
|
120
|
+
commands.forEach(name => {
|
|
121
|
+
function decoratedWrapper(origFn, ...args) {
|
|
122
|
+
return runWithHistoryHooks({
|
|
123
|
+
session,
|
|
124
|
+
callstack,
|
|
125
|
+
nodeData: { name, args, elementScope, overwrite: false },
|
|
126
|
+
fn: () => origFn(...args),
|
|
127
|
+
config,
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
131
|
+
session.overwriteCommand(name, decoratedWrapper, elementScope);
|
|
132
|
+
});
|
|
133
|
+
};
|
|
134
|
+
const overwriteBrowserCommands = (session, callstack, config) => overwriteCommands({
|
|
68
135
|
session,
|
|
69
136
|
callstack,
|
|
70
137
|
commands: cmds.getBrowserCommands().filter(cmd => !shouldNotWrapCommand(cmd)),
|
|
71
138
|
elementScope: false,
|
|
139
|
+
config,
|
|
72
140
|
});
|
|
73
|
-
const overwriteElementCommands = (session, callstack) => overwriteCommands({
|
|
141
|
+
const overwriteElementCommands = (session, callstack, config) => overwriteCommands({
|
|
74
142
|
session,
|
|
75
143
|
callstack,
|
|
76
144
|
commands: cmds.getElementCommands(),
|
|
77
145
|
elementScope: true,
|
|
146
|
+
config,
|
|
78
147
|
});
|
|
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) => {
|
|
148
|
+
const runGroup = ({ session, callstack, config }, name, fn) => {
|
|
92
149
|
if (!callstack) {
|
|
93
150
|
return fn();
|
|
94
151
|
}
|
|
95
152
|
return runWithHistoryHooks({
|
|
153
|
+
session,
|
|
96
154
|
callstack,
|
|
97
|
-
nodeData: { name, isGroup: true },
|
|
155
|
+
nodeData: { name, args: [], isGroup: true },
|
|
98
156
|
fn,
|
|
157
|
+
config,
|
|
99
158
|
});
|
|
100
159
|
};
|
|
101
|
-
exports.
|
|
160
|
+
exports.runGroup = runGroup;
|
|
161
|
+
const overwriteRunStepCommand = (session, callstack, config) => {
|
|
162
|
+
session.overwriteCommand("runStep", (origCommand, stepName, stepCb) => {
|
|
163
|
+
return (0, exports.runGroup)({ session, callstack, config }, stepName, () => origCommand(stepName, stepCb));
|
|
164
|
+
});
|
|
165
|
+
};
|
|
166
|
+
const initCommandHistory = (session, config) => {
|
|
167
|
+
const callstack = new callstack_1.Callstack();
|
|
168
|
+
overwriteAddCommand(session, callstack, config);
|
|
169
|
+
overwriteBrowserCommands(session, callstack, config);
|
|
170
|
+
overwriteElementCommands(session, callstack, config);
|
|
171
|
+
overwriteOverwriteCommand(session, callstack, config);
|
|
172
|
+
overwriteRunStepCommand(session, callstack, config);
|
|
173
|
+
return callstack;
|
|
174
|
+
};
|
|
175
|
+
exports.initCommandHistory = initCommandHistory;
|
|
102
176
|
//# 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":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,2CAAwC;AACxC,iDAAmC;AACnC,mCAAsE;AAEtE,8CAAgD;AAChD,uCAAoD;AACpD,mCAAyF;AAWzF,MAAM,oBAAoB,GAAG,CAAC,WAAmB,EAAW,EAAE,CAC1D,CAAC,YAAY,EAAE,kBAAkB,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AAExG,MAAM,iBAAiB,GAAG,CAAC,UAAoB,EAAE,WAAqB,EAAW,EAAE,CACtF,IAAA,eAAO,EAAC,UAAU,CAAC,IAAI,IAAA,eAAO,EAAC,WAAW,CAAC,CAAC;AADnC,QAAA,iBAAiB,qBACkB;AAEhD,MAAM,aAAa,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAY,EAAY,EAAE;IAChG,MAAM,GAAG,GAAsB;QAC3B,CAAC,mBAAW,CAAC,IAAI,CAAC,EAAE,IAAI;QACxB,CAAC,mBAAW,CAAC,IAAI,CAAC,EAAE,IAAA,4BAAoB,EAAC,IAAI,EAAE,IAAI,CAAC;QACpD,CAAC,mBAAW,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,YAAY,IAAI,KAAK,CAAC;QAC5D,CAAC,mBAAW,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,MAAM,EAAE;KACrC,CAAC;IAEF,IAAI,SAAS,EAAE,CAAC;QACZ,GAAG,CAAC,mBAAW,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACV,GAAG,CAAC,mBAAW,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;IACpC,CAAC;IAED,OAAO,GAAe,CAAC;AAC3B,CAAC,CAAC;AAaK,MAAM,iBAAiB,GAAG,KAAK,EAClC,EAAE,SAAS,EAAyC,EACpD,EAAW,EACD,EAAE;IACZ,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAClC,IAAI,CAAC;QACD,OAAO,MAAM,EAAE,EAAE,CAAC;IACtB,CAAC;YAAS,CAAC;QACP,SAAS,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACvC,CAAC;AACL,CAAC,CAAC;AAVW,QAAA,iBAAiB,qBAU5B;AAEF,MAAM,mBAAmB,GAAG,CAAI,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAA8B,EAAK,EAAE;IAC3G,QAAQ,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,IAAI,MAAM,EAAE,CAAC;IAExC,IAAI,SAAS,CAAC,cAAc,EAAE,CAAC;QAC3B,OAAO,EAAE,EAAE,CAAC;IAChB,CAAC;IAED,OAAO,IAAA,oBAAY,EAAC;QAChB,MAAM,EAAE,KAAK,IAAI,EAAE;YACf,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;YACtC,MAAM,OAAO,GAAG,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,EAAE,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;YAClE,MAAM,YAAY,GAAG,UAAU,KAAK,kBAAU,CAAC,GAAG,IAAI,CAAC,CAAC,UAAU,KAAK,kBAAU,CAAC,YAAY,IAAI,CAAC,OAAO,CAAC,CAAC;YAE5G,IAAI,WAAW,GAAoB,EAAE,CAAC;YACtC,IAAI,YAAY,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;gBAC3D,WAAW,GAAG,MAAM,IAAA,oCAA4B,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YACzE,CAAC;YAED,MAAM,mBAAmB,GAAG,IAAA,oBAAY,EAAC,WAAW,CAAC,CAAC;YACtD,IAAA,0BAAkB,EAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;YAEjD,SAAS,CAAC,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC7C,CAAC;QACD,EAAE;QACF,KAAK,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAI,CAAC;QAC3C,KAAK,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,yBAAiB,CAAC;KACtD,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,OAA4B,EAAE,SAAoB,EAAE,MAAqB,EAAQ,EAAE;IAC5G,OAAO,CAAC,gBAAgB,CAAC,YAAY,EAAE,CAAC,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE;QAChF,IAAI,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,OAAO,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;QACpD,CAAC;QAED,SAAS,gBAAgB,CAA4B,GAAG,IAAe;YACnE,OAAO,mBAAmB,CAAC;gBACvB,OAAO;gBACP,SAAS;gBACT,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,KAAK,EAAE;gBACxD,EAAE,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC;gBACnC,MAAM;aACT,CAAC,CAAC;QACP,CAAC;QAED,OAAO,WAAW,CAAC,IAAI,EAAE,gBAAgB,EAAE,YAAY,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAAC,OAA4B,EAAE,SAAoB,EAAE,MAAqB,EAAQ,EAAE;IAClH,OAAO,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,CAAC,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE;QACtF,IAAI,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,OAAO,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;QACpD,CAAC;QAED,SAAS,gBAAgB,CAErB,MAAuC,EACvC,GAAG,IAAe;YAElB,OAAO,mBAAmB,CAAC;gBACvB,OAAO;gBACP,SAAS;gBACT,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE;gBACvD,EAAE,EAAE,GAAG,EAAE,CAAE,OAA2C,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;gBACrF,MAAM;aACT,CAAC,CAAC;QACP,CAAC;QAED,8DAA8D;QAC9D,OAAO,WAAW,CAAC,IAAI,EAAE,gBAAuB,EAAE,YAAY,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAOF,MAAM,iBAAiB,GAAG,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAyB,EAAQ,EAAE;IAC9G,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACpB,SAAS,gBAAgB,CAAC,MAAuC,EAAE,GAAG,IAAe;YACjF,OAAO,mBAAmB,CAAC;gBACvB,OAAO;gBACP,SAAS;gBACT,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,KAAK,EAAE;gBACxD,EAAE,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;gBACzB,MAAM;aACT,CAAC,CAAC;QACP,CAAC;QAED,8DAA8D;QAC9D,OAAO,CAAC,gBAAgB,CAAC,IAAW,EAAE,gBAAuB,EAAE,YAAmB,CAAC,CAAC;IACxF,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAAC,OAA4B,EAAE,SAAoB,EAAE,MAAqB,EAAQ,EAAE,CACjH,iBAAiB,CAAC;IACd,OAAO;IACP,SAAS;IACT,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAC7E,YAAY,EAAE,KAAK;IACnB,MAAM;CACT,CAAC,CAAC;AAEP,MAAM,wBAAwB,GAAG,CAAC,OAA4B,EAAE,SAAoB,EAAE,MAAqB,EAAQ,EAAE,CACjH,iBAAiB,CAAC;IACd,OAAO;IACP,SAAS;IACT,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE;IACnC,YAAY,EAAE,IAAI;IAClB,MAAM;CACT,CAAC,CAAC;AAEA,MAAM,QAAQ,GAAG,CAAI,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAa,EAAE,IAAY,EAAE,EAAW,EAAK,EAAE;IACnG,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,OAAO,EAAE,EAAE,CAAC;IAChB,CAAC;IAED,OAAO,mBAAmB,CAAC;QACvB,OAAO;QACP,SAAS;QACT,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;QAC3C,EAAE;QACF,MAAM;KACT,CAAC,CAAC;AACP,CAAC,CAAC;AAZW,QAAA,QAAQ,YAYnB;AAEF,MAAM,uBAAuB,GAAG,CAAC,OAA4B,EAAE,SAAoB,EAAE,MAAqB,EAAQ,EAAE;IAChH,OAAO,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,WAAW,EAAE,QAAgB,EAAE,MAAM,EAAE,EAAE;QAC1E,OAAO,IAAA,gBAAQ,EAAC,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;IACnG,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,CAAC,OAA4B,EAAE,MAAqB,EAAa,EAAE;IACjG,MAAM,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;IAElC,mBAAmB,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IAChD,wBAAwB,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IACrD,wBAAwB,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IACrD,yBAAyB,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IACtD,uBAAuB,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IAEpD,OAAO,SAAS,CAAC;AACrB,CAAC,CAAC;AAVW,QAAA,kBAAkB,sBAU7B"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { eventWithTime } from "@rrweb/types";
|
|
2
|
+
import type { Callstack } from "./callstack";
|
|
3
|
+
export declare function installRrwebAndCollectEvents(session: WebdriverIO.Browser, callstack: Callstack): Promise<eventWithTime[]>;
|
|
4
|
+
export declare function filterEvents(rrwebEvents: eventWithTime[]): eventWithTime[];
|
|
5
|
+
export declare function sendFilteredEvents(session: WebdriverIO.Browser, rrwebEvents: eventWithTime[]): void;
|
|
@@ -0,0 +1,74 @@
|
|
|
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.sendFilteredEvents = exports.filterEvents = exports.installRrwebAndCollectEvents = void 0;
|
|
7
|
+
const fs_1 = __importDefault(require("fs"));
|
|
8
|
+
const events_1 = require("../../events");
|
|
9
|
+
const index_1 = require("./index");
|
|
10
|
+
const path_1 = __importDefault(require("path"));
|
|
11
|
+
const rrwebCode = fs_1.default.readFileSync(path_1.default.join(require.resolve("@rrweb/record"), "../record.umd.min.cjs"), "utf-8");
|
|
12
|
+
async function installRrwebAndCollectEvents(session, callstack) {
|
|
13
|
+
/* eslint-disable @typescript-eslint/ban-ts-comment */
|
|
14
|
+
return (0, index_1.runWithoutHistory)({ callstack }, () => session.execute(rrwebRecordFnCode => {
|
|
15
|
+
try {
|
|
16
|
+
// @ts-expect-error
|
|
17
|
+
if (!window.rrweb) {
|
|
18
|
+
eval(rrwebRecordFnCode);
|
|
19
|
+
// @ts-expect-error
|
|
20
|
+
window.lastProcessedRrwebEvent = -1;
|
|
21
|
+
// @ts-expect-error
|
|
22
|
+
window.rrwebEvents = [];
|
|
23
|
+
// @ts-expect-error
|
|
24
|
+
window.rrweb.record({
|
|
25
|
+
// @ts-expect-error
|
|
26
|
+
emit(event) {
|
|
27
|
+
// @ts-expect-error
|
|
28
|
+
window.rrwebEvents.push(event);
|
|
29
|
+
},
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
catch (e) {
|
|
34
|
+
/**/
|
|
35
|
+
}
|
|
36
|
+
let result;
|
|
37
|
+
try {
|
|
38
|
+
// @ts-expect-error
|
|
39
|
+
result = window.rrwebEvents.slice(window.lastProcessedRrwebEvent + 1);
|
|
40
|
+
// @ts-expect-error
|
|
41
|
+
window.lastProcessedRrwebEvent = window.rrwebEvents.length - 1;
|
|
42
|
+
}
|
|
43
|
+
catch {
|
|
44
|
+
result = [];
|
|
45
|
+
}
|
|
46
|
+
return result;
|
|
47
|
+
}, rrwebCode));
|
|
48
|
+
/* eslint-enable @typescript-eslint/ban-ts-comment */
|
|
49
|
+
}
|
|
50
|
+
exports.installRrwebAndCollectEvents = installRrwebAndCollectEvents;
|
|
51
|
+
function filterEvents(rrwebEvents) {
|
|
52
|
+
return rrwebEvents.filter(e => {
|
|
53
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
54
|
+
const dataAny = e?.data;
|
|
55
|
+
return !dataAny?.attributes?.[0]?.attributes?.["cd_frame_id_"];
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
exports.filterEvents = filterEvents;
|
|
59
|
+
function sendFilteredEvents(session, rrwebEvents) {
|
|
60
|
+
if (rrwebEvents.length > 0 && process.send) {
|
|
61
|
+
process.send({
|
|
62
|
+
event: events_1.MasterEvents.DOM_SNAPSHOTS,
|
|
63
|
+
context: {
|
|
64
|
+
testPath: session.executionContext?.titlePath?.(),
|
|
65
|
+
browserId: session.executionContext?.browserId,
|
|
66
|
+
},
|
|
67
|
+
data: {
|
|
68
|
+
rrwebSnapshots: rrwebEvents,
|
|
69
|
+
},
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
exports.sendFilteredEvents = sendFilteredEvents;
|
|
74
|
+
//# sourceMappingURL=rrweb.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rrweb.js","sourceRoot":"","sources":["../../../../src/browser/history/rrweb.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AAGpB,yCAA4C;AAE5C,mCAA4C;AAC5C,gDAAwB;AAExB,MAAM,SAAS,GAAG,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,uBAAuB,CAAC,EAAE,OAAO,CAAC,CAAC;AAE1G,KAAK,UAAU,4BAA4B,CAC9C,OAA4B,EAC5B,SAAoB;IAEpB,sDAAsD;IACtD,OAAO,IAAA,yBAAiB,EAA2B,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,CACnE,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE;QAChC,IAAI,CAAC;YACD,mBAAmB;YACnB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,iBAAiB,CAAC,CAAC;gBAExB,mBAAmB;gBACnB,MAAM,CAAC,uBAAuB,GAAG,CAAC,CAAC,CAAC;gBACpC,mBAAmB;gBACnB,MAAM,CAAC,WAAW,GAAG,EAAE,CAAC;gBAExB,mBAAmB;gBACnB,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;oBAChB,mBAAmB;oBACnB,IAAI,CAAC,KAAK;wBACN,mBAAmB;wBACnB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACnC,CAAC;iBACJ,CAAC,CAAC;YACP,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,IAAI;QACR,CAAC;QAED,IAAI,MAAM,CAAC;QACX,IAAI,CAAC;YACD,mBAAmB;YACnB,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,uBAAuB,GAAG,CAAC,CAAC,CAAC;YACtE,mBAAmB;YACnB,MAAM,CAAC,uBAAuB,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;QACnE,CAAC;QAAC,MAAM,CAAC;YACL,MAAM,GAAG,EAAE,CAAC;QAChB,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC,EAAE,SAAS,CAAC,CAChB,CAAC;IACF,qDAAqD;AACzD,CAAC;AA5CD,oEA4CC;AAED,SAAgB,YAAY,CAAC,WAA4B;IACrD,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;QAC1B,8DAA8D;QAC9D,MAAM,OAAO,GAAG,CAAC,EAAE,IAAW,CAAC;QAC/B,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,cAAc,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;AACP,CAAC;AAND,oCAMC;AAED,SAAgB,kBAAkB,CAAC,OAA4B,EAAE,WAA4B;IACzF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACzC,OAAO,CAAC,IAAI,CAAC;YACT,KAAK,EAAE,qBAAY,CAAC,aAAa;YACjC,OAAO,EAAE;gBACL,QAAQ,EAAE,OAAO,CAAC,gBAAgB,EAAE,SAAS,EAAE,EAAE;gBACjD,SAAS,EAAE,OAAO,CAAC,gBAAgB,EAAE,SAAS;aAC3B;YACvB,IAAI,EAAE;gBACF,cAAc,EAAE,WAAW;aACN;SAC5B,CAAC,CAAC;IACP,CAAC;AACL,CAAC;AAbD,gDAaC"}
|
|
@@ -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"}
|
|
@@ -68,7 +68,11 @@ class NewBrowser extends browser_1.Browser {
|
|
|
68
68
|
this._extendStacktrace();
|
|
69
69
|
this._addSteps();
|
|
70
70
|
this._addHistory();
|
|
71
|
-
await (0, history_1.runGroup)(
|
|
71
|
+
await (0, history_1.runGroup)({
|
|
72
|
+
session: this._session,
|
|
73
|
+
callstack: this._callstackHistory,
|
|
74
|
+
config: this._config,
|
|
75
|
+
}, "testplane: init browser", async () => {
|
|
72
76
|
this._addCommands();
|
|
73
77
|
this.restoreHttpTimeout();
|
|
74
78
|
await this._setPageLoadTimeout();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new-browser.js","sourceRoot":"","sources":["../../../src/browser/new-browser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAAsC;AAEtC,kDAAwB;AACxB,mCAAyD;AACzD,6CAAoD;AAEpD,uCAAiD;AACjD,uEAA8C;AAC9C,uCAAqC;AACrC,4CAAuC;AACvC,8CAA4D;AAC5D,6DAAuD;AACvD,gDAM6B;AAG7B,iDAAiE;AACjE,mCAA2D;AAY3D,MAAM,YAAY,GAAG,IAAI,CAAC;AAE1B,MAAM,sBAAsB,GAA2B;IACnD,CAAC,mBAAW,CAAC,MAAM,CAAC,EAAE;QAClB,cAAc,EAAE,oBAAoB;QACpC,OAAO,EAAE,CAAC,YAAuC,EAAY,EAAE;YAC3D,MAAM,aAAa,GAAG,IAAA,kBAAS,EAAC,YAAY,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,YAAY,EAAE,CAAC;YAExF,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;QAC1C,CAAC;KACJ;IACD,CAAC,mBAAW,CAAC,OAAO,CAAC,EAAE;QACnB,cAAc,EAAE,oBAAoB;QACpC,OAAO,EAAE,GAAa,EAAE,CAAC,CAAC,WAAW,CAAC;KACzC;IACD,CAAC,mBAAW,CAAC,IAAI,CAAC,EAAE;QAChB,cAAc,EAAE,gBAAgB;QAChC,OAAO,EAAE,GAAa,EAAE,CAAC,CAAC,YAAY,CAAC;KAC1C;CACJ,CAAC;AAEF,MAAa,UAAW,SAAQ,iBAAO;IACnC,YAAY,MAAc,EAAE,IAAiB;QACzC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAEpB,wBAAa,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,IAAI;QACN,IAAI,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAE5C,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,CAAC,WAAW,EAAE,CAAC;QAEnB,MAAM,IAAA,kBAAQ,
|
|
1
|
+
{"version":3,"file":"new-browser.js","sourceRoot":"","sources":["../../../src/browser/new-browser.ts"],"names":[],"mappings":"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"}
|
|
@@ -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":"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"}
|
|
@@ -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
|
};
|