testplane 9.0.0 → 9.0.1
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 +7 -7
- package/build/src/browser/client-bridge/index.js +7 -4
- package/build/src/browser/client-bridge/index.js.map +1 -1
- package/build/src/browser/client-scripts/browser-utils/build/bundle.compat.js +1 -1
- package/build/src/browser/client-scripts/browser-utils/build/bundle.native.js +1 -1
- package/build/src/browser/client-scripts/browser-utils/tsc-out/client-scripts/shared/lib.compat.js +9 -1
- package/build/src/browser/client-scripts/browser-utils/tsc-out/client-scripts/shared/lib.native.js +5 -1
- package/build/src/browser/client-scripts/calibrate.js +8 -1
- package/build/src/browser/client-scripts/screen-shooter/build/bundle.compat.js +35 -23
- package/build/src/browser/client-scripts/screen-shooter/build/bundle.native.js +20 -16
- package/build/src/browser/client-scripts/screen-shooter/tsc-out/client-scripts/screen-shooter/utils/dom.js +25 -1
- package/build/src/browser/client-scripts/screen-shooter/tsc-out/client-scripts/shared/lib.compat.js +9 -1
- package/build/src/browser/client-scripts/screen-shooter/tsc-out/client-scripts/shared/lib.native.js +5 -1
- package/build/src/browser/commands/assert-view/index.js +18 -12
- package/build/src/browser/commands/assert-view/index.js.map +1 -1
- package/build/src/browser/history/index.js +5 -0
- package/build/src/browser/history/index.js.map +1 -1
- package/build/src/browser/history/rrweb.js +49 -15
- package/build/src/browser/history/rrweb.js.map +1 -1
- package/build/src/browser/new-browser.d.ts +1 -0
- package/build/src/browser/new-browser.js +4 -1
- package/build/src/browser/new-browser.js.map +1 -1
- package/build/src/browser/screen-shooter/elements-screen-shooter.js +35 -28
- package/build/src/browser/screen-shooter/elements-screen-shooter.js.map +1 -1
- package/build/src/browser/screen-shooter/operations/wait-for-selectors-to-settle.d.ts +5 -1
- package/build/src/browser/screen-shooter/operations/wait-for-selectors-to-settle.js +32 -18
- package/build/src/browser/screen-shooter/operations/wait-for-selectors-to-settle.js.map +1 -1
- package/build/src/browser-installer/chromium/utils.js +1 -0
- package/build/src/browser-installer/chromium/utils.js.map +1 -1
- package/build/src/browser-installer/utils.js +50 -3
- package/build/src/browser-installer/utils.js.map +1 -1
- package/build/src/cli/index.js +10 -14
- package/build/src/cli/index.js.map +1 -1
- package/build/src/cli/repl-options.d.ts +3 -0
- package/build/src/cli/repl-options.js +16 -0
- package/build/src/cli/repl-options.js.map +1 -0
- package/build/src/runner/browser-env/vite/browser-modules/tsconfig.tsbuildinfo +1 -1
- package/build/src/utils/repl-module-hooks.js +75 -5
- package/build/src/utils/repl-module-hooks.js.map +1 -1
- package/package.json +7 -7
|
@@ -5,26 +5,49 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.sendFilteredEvents = exports.filterEvents = exports.cleanupRrweb = exports.installRrwebAndCollectEvents = void 0;
|
|
7
7
|
const fs_1 = __importDefault(require("fs"));
|
|
8
|
+
const path_1 = __importDefault(require("path"));
|
|
9
|
+
const debug_1 = __importDefault(require("debug"));
|
|
8
10
|
const events_1 = require("../../events");
|
|
9
11
|
const index_1 = require("./index");
|
|
10
|
-
const
|
|
12
|
+
const debug = (0, debug_1.default)("testplane:time-travel:rrweb");
|
|
11
13
|
// Built from branch https://github.com/gemini-testing/rrweb/tree/TESTPLANE-712.syntax_err
|
|
12
14
|
// PR: https://github.com/rrweb-io/rrweb/pull/1735
|
|
13
15
|
// Issue: https://github.com/rrweb-io/rrweb/issues/1734
|
|
14
16
|
const rrwebCode = fs_1.default.readFileSync(path_1.default.join(__dirname, "../client-scripts/rrweb-record.min.js"), "utf-8");
|
|
15
|
-
const
|
|
17
|
+
const sessionsWithRrwebSent = new WeakSet();
|
|
18
|
+
const sessionsWithUnsupportedRrweb = new WeakSet();
|
|
16
19
|
/* eslint-disable @typescript-eslint/ban-ts-comment */
|
|
17
20
|
async function installRrwebAndCollectEvents(session, callstack) {
|
|
18
21
|
return (0, index_1.runWithoutHistory)({ callstack }, async () => {
|
|
19
|
-
|
|
22
|
+
if (sessionsWithUnsupportedRrweb.has(session)) {
|
|
23
|
+
return [];
|
|
24
|
+
}
|
|
25
|
+
const shouldSendRrwebCode = !sessionsWithRrwebSent.has(session);
|
|
20
26
|
if (shouldSendRrwebCode) {
|
|
21
|
-
|
|
27
|
+
sessionsWithRrwebSent.add(session);
|
|
28
|
+
}
|
|
29
|
+
let result = await collectRrwebEvents(session, shouldSendRrwebCode ? rrwebCode : undefined);
|
|
30
|
+
let debugBrowserId = "";
|
|
31
|
+
if (debug.enabled) {
|
|
32
|
+
debugBrowserId = `${session?.capabilities?.browserName} ${session?.capabilities?.browserVersion}:${session?.sessionId}`;
|
|
22
33
|
}
|
|
23
|
-
|
|
34
|
+
if (result.isRrwebSupported === false) {
|
|
35
|
+
debug("rrweb is not supported in browser %s, error: %s", debugBrowserId, result.evalError);
|
|
36
|
+
sessionsWithUnsupportedRrweb.add(session);
|
|
37
|
+
return [];
|
|
38
|
+
}
|
|
39
|
+
// If rrweb is installed (success) or we already provided the code (no point in trying again)
|
|
24
40
|
if (result.isRrwebInstalled || shouldSendRrwebCode) {
|
|
25
41
|
return result.rrwebEvents;
|
|
26
42
|
}
|
|
27
|
-
|
|
43
|
+
debug("collectRrwebEvents, rrweb was not installed, sending code again");
|
|
44
|
+
result = await collectRrwebEvents(session, rrwebCode);
|
|
45
|
+
if (result.isRrwebSupported === false) {
|
|
46
|
+
debug("rrweb is not supported in browser %s, error: %s", debugBrowserId, result.evalError);
|
|
47
|
+
sessionsWithUnsupportedRrweb.add(session);
|
|
48
|
+
return [];
|
|
49
|
+
}
|
|
50
|
+
return result.rrwebEvents;
|
|
28
51
|
});
|
|
29
52
|
}
|
|
30
53
|
exports.installRrwebAndCollectEvents = installRrwebAndCollectEvents;
|
|
@@ -34,8 +57,8 @@ async function cleanupRrweb(session, callstack) {
|
|
|
34
57
|
try {
|
|
35
58
|
// @ts-expect-error
|
|
36
59
|
const rrwebEvents = window.rrwebEvents;
|
|
37
|
-
const rrwebData = rrwebEvents
|
|
38
|
-
if (rrwebData
|
|
60
|
+
const rrwebData = rrwebEvents && rrwebEvents.testplane;
|
|
61
|
+
if (rrwebData && rrwebData.stopRecording) {
|
|
39
62
|
try {
|
|
40
63
|
rrwebData.stopRecording();
|
|
41
64
|
}
|
|
@@ -44,8 +67,8 @@ async function cleanupRrweb(session, callstack) {
|
|
|
44
67
|
}
|
|
45
68
|
}
|
|
46
69
|
try {
|
|
47
|
-
const colorSchemeMedia = rrwebData
|
|
48
|
-
const colorSchemeListener = rrwebData
|
|
70
|
+
const colorSchemeMedia = rrwebData && rrwebData.colorSchemeMedia;
|
|
71
|
+
const colorSchemeListener = rrwebData && rrwebData.colorSchemeListener;
|
|
49
72
|
if (colorSchemeMedia && colorSchemeListener) {
|
|
50
73
|
colorSchemeMedia.removeEventListener("change", colorSchemeListener);
|
|
51
74
|
}
|
|
@@ -53,7 +76,7 @@ async function cleanupRrweb(session, callstack) {
|
|
|
53
76
|
catch (e) {
|
|
54
77
|
/**/
|
|
55
78
|
}
|
|
56
|
-
if (rrwebData
|
|
79
|
+
if (rrwebData && rrwebData.isInstalledByTestplane) {
|
|
57
80
|
// @ts-expect-error
|
|
58
81
|
delete window.rrweb;
|
|
59
82
|
// @ts-expect-error
|
|
@@ -74,7 +97,8 @@ async function cleanupRrweb(session, callstack) {
|
|
|
74
97
|
/**/
|
|
75
98
|
}
|
|
76
99
|
finally {
|
|
77
|
-
|
|
100
|
+
sessionsWithRrwebSent.delete(session);
|
|
101
|
+
sessionsWithUnsupportedRrweb.delete(session);
|
|
78
102
|
}
|
|
79
103
|
}
|
|
80
104
|
exports.cleanupRrweb = cleanupRrweb;
|
|
@@ -85,7 +109,7 @@ function collectRrwebEvents(session, rrwebRecordFnCode) {
|
|
|
85
109
|
// @ts-expect-error
|
|
86
110
|
return Boolean(window.rrweb);
|
|
87
111
|
}
|
|
88
|
-
catch {
|
|
112
|
+
catch (e) {
|
|
89
113
|
return false;
|
|
90
114
|
}
|
|
91
115
|
};
|
|
@@ -97,7 +121,7 @@ function collectRrwebEvents(session, rrwebRecordFnCode) {
|
|
|
97
121
|
// @ts-expect-error
|
|
98
122
|
window.lastProcessedRrwebEvent = window.rrwebEvents.length - 1;
|
|
99
123
|
}
|
|
100
|
-
catch {
|
|
124
|
+
catch (e) {
|
|
101
125
|
result = [];
|
|
102
126
|
}
|
|
103
127
|
return result;
|
|
@@ -140,7 +164,17 @@ function collectRrwebEvents(session, rrwebRecordFnCode) {
|
|
|
140
164
|
};
|
|
141
165
|
try {
|
|
142
166
|
if (!isRrwebInstalled() && rrwebRecordFnCode) {
|
|
143
|
-
|
|
167
|
+
try {
|
|
168
|
+
window.eval(rrwebRecordFnCode);
|
|
169
|
+
}
|
|
170
|
+
catch (e) {
|
|
171
|
+
return {
|
|
172
|
+
isRrwebSupported: false,
|
|
173
|
+
isRrwebInstalled: false,
|
|
174
|
+
rrwebEvents: [],
|
|
175
|
+
evalError: String(e),
|
|
176
|
+
};
|
|
177
|
+
}
|
|
144
178
|
// @ts-expect-error
|
|
145
179
|
window.lastProcessedRrwebEvent = -1;
|
|
146
180
|
// @ts-expect-error
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rrweb.js","sourceRoot":"","sources":["../../../../src/browser/history/rrweb.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;
|
|
1
|
+
{"version":3,"file":"rrweb.js","sourceRoot":"","sources":["../../../../src/browser/history/rrweb.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ export type HeadlessBrowserOptions = Partial<Record<W3CBrowserName, {
|
|
|
10
10
|
getArgs: (headlessMode: BrowserConfig["headless"]) => string[];
|
|
11
11
|
}>>;
|
|
12
12
|
export declare class NewBrowser extends Browser {
|
|
13
|
+
private _onExit;
|
|
13
14
|
constructor(config: Config, opts: BrowserOpts);
|
|
14
15
|
init(): Promise<NewBrowser>;
|
|
15
16
|
reset(): Promise<void>;
|
|
@@ -66,7 +66,9 @@ const headlessBrowserOptions = {
|
|
|
66
66
|
class NewBrowser extends browser_1.Browser {
|
|
67
67
|
constructor(config, opts) {
|
|
68
68
|
super(config, opts);
|
|
69
|
-
|
|
69
|
+
this._onExit = async () => { };
|
|
70
|
+
this._onExit = async (err) => await this.quit(err);
|
|
71
|
+
signal_handler_1.default.on("exit", this._onExit);
|
|
70
72
|
}
|
|
71
73
|
async init() {
|
|
72
74
|
this._session = await this._createSession();
|
|
@@ -80,6 +82,7 @@ class NewBrowser extends browser_1.Browser {
|
|
|
80
82
|
}
|
|
81
83
|
async quit(err) {
|
|
82
84
|
this._exitError = err;
|
|
85
|
+
signal_handler_1.default.off("exit", this._onExit);
|
|
83
86
|
try {
|
|
84
87
|
this.setHttpTimeout(this._config.sessionQuitTimeout);
|
|
85
88
|
await this._session.deleteSession();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new-browser.js","sourceRoot":"","sources":["../../../src/browser/new-browser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAAsC;AACtC,kDAAwB;AACxB,mCAAyD;AACzD,wDAAgD;AAGhD,uCAAiD;AACjD,uEAA8C;AAC9C,4CAAuC;AACvC,8CAA4D;AAC5D,6DAAuD;AACvD,gDAA4F;AAG5F,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,mBAAmB,CAAC,EAAE;QAC/B,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;
|
|
1
|
+
{"version":3,"file":"new-browser.js","sourceRoot":"","sources":["../../../src/browser/new-browser.ts"],"names":[],"mappings":"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"}
|
|
@@ -81,14 +81,18 @@ function getCaptureAreaTop(captureSpecs) {
|
|
|
81
81
|
return Math.min(...captureSpecs.map(spec => spec.full.top));
|
|
82
82
|
}
|
|
83
83
|
function getSafeAreaRollbackDistance(lastState, currentState) {
|
|
84
|
-
const previousCaptureAreaTop = getCaptureAreaTop(lastState.captureSpecs);
|
|
85
84
|
const currentCaptureAreaTop = getCaptureAreaTop(currentState.captureSpecs);
|
|
86
|
-
if (
|
|
85
|
+
if (currentCaptureAreaTop === null) {
|
|
87
86
|
return 0;
|
|
88
87
|
}
|
|
89
|
-
|
|
90
|
-
const
|
|
91
|
-
|
|
88
|
+
let previousCoveredBottom = 0;
|
|
89
|
+
const previousCaptureAreaTop = lastState ? getCaptureAreaTop(lastState.captureSpecs) : null;
|
|
90
|
+
if (lastState && previousCaptureAreaTop !== null) {
|
|
91
|
+
const previousVisibleBottom = Math.max(...lastState.captureSpecs.map(spec => (0, geometry_1.getBottom)(spec.visible)));
|
|
92
|
+
const previousSafeBottom = (0, geometry_1.getBottom)(lastState.safeArea);
|
|
93
|
+
previousCoveredBottom =
|
|
94
|
+
Math.min(previousVisibleBottom, previousSafeBottom) - previousCaptureAreaTop;
|
|
95
|
+
}
|
|
92
96
|
const currentSafeAreaTop = currentState.safeArea.top - currentCaptureAreaTop;
|
|
93
97
|
return Math.max(0, currentSafeAreaTop - previousCoveredBottom);
|
|
94
98
|
}
|
|
@@ -247,7 +251,9 @@ class ElementsScreenShooter {
|
|
|
247
251
|
while (iterations < constants_1.COMPOSITING_ITERATIONS_LIMIT && !hasCapturedTheWholeArea && !hasReachedScrollLimit) {
|
|
248
252
|
debug(`========== Starting compositing iteration #${iterations} ==========`);
|
|
249
253
|
const waitForSettleStartTime = performance.now();
|
|
250
|
-
await (0, operations_1.waitForSelectorsToSettle)(this._browser, selectorsToCapture
|
|
254
|
+
await (0, operations_1.waitForSelectorsToSettle)(this._browser, selectorsToCapture, {
|
|
255
|
+
needsCompatLib: this._browserProperties.needsCompatLib,
|
|
256
|
+
});
|
|
251
257
|
waitForSettleTime += performance.now() - waitForSettleStartTime;
|
|
252
258
|
const recomputeStartTime = performance.now();
|
|
253
259
|
const enabledScrollDebugTopics = [];
|
|
@@ -271,36 +277,37 @@ class ElementsScreenShooter {
|
|
|
271
277
|
}
|
|
272
278
|
let currentState = currentStateOrError;
|
|
273
279
|
const safeAreaShrink = (lastState.safeArea.height - currentState.safeArea.height);
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
280
|
+
const safeAreaTopShift = currentState.safeArea.top - lastState.safeArea.top;
|
|
281
|
+
const rollbackDistance = safeAreaShrink > 0 || safeAreaTopShift > 0
|
|
282
|
+
? getSafeAreaRollbackDistance(iterations > 0 ? lastState : null, currentState)
|
|
283
|
+
: 0;
|
|
284
|
+
if (rollbackDistance > 0) {
|
|
285
|
+
debug("safe area shrank or shifted after scroll", {
|
|
278
286
|
previousSafeArea: lastState.safeArea,
|
|
279
287
|
newSafeArea: currentState.safeArea,
|
|
280
288
|
safeAreaShrink,
|
|
289
|
+
safeAreaTopShift,
|
|
281
290
|
rollbackDistance,
|
|
282
291
|
previousOffset: lastState.scrollOffset,
|
|
283
292
|
scrolledOffset: currentState.scrollOffset,
|
|
284
293
|
});
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
throw new Error(`Failed to rollback and recompute full areas while compositing image of selectors: ${selectorsToCapture.join(", ")}`);
|
|
301
|
-
}
|
|
302
|
-
currentState = afterRollbackState;
|
|
294
|
+
await this._browserSideScreenshooter.call("scrollBy", [
|
|
295
|
+
selectorsToCapture,
|
|
296
|
+
-rollbackDistance,
|
|
297
|
+
opts.selectorToScroll,
|
|
298
|
+
]);
|
|
299
|
+
const afterRollbackState = await this._browserSideScreenshooter.call("getCaptureState", [
|
|
300
|
+
selectorsToCapture,
|
|
301
|
+
selectorsToIgnore,
|
|
302
|
+
opts.selectorToScroll,
|
|
303
|
+
]);
|
|
304
|
+
if ((0, types_1.isBrowserSideError)(afterRollbackState)) {
|
|
305
|
+
throw new Error(`Failed to rollback and recompute areas while compositing image of selectors: ${selectorsToCapture.join(", ")}, error type '${afterRollbackState.errorCode}' and error message: ${afterRollbackState.message}`);
|
|
306
|
+
}
|
|
307
|
+
if (!afterRollbackState.safeArea || !afterRollbackState.ignoreAreas) {
|
|
308
|
+
throw new Error(`Failed to rollback and recompute full areas while compositing image of selectors: ${selectorsToCapture.join(", ")}`);
|
|
303
309
|
}
|
|
310
|
+
currentState = afterRollbackState;
|
|
304
311
|
}
|
|
305
312
|
const callbackStartTime = performance.now();
|
|
306
313
|
await onNextScroll(currentState);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"elements-screen-shooter.js","sourceRoot":"","sources":["../../../../src/browser/screen-shooter/elements-screen-shooter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"elements-screen-shooter.js","sourceRoot":"","sources":["../../../../src/browser/screen-shooter/elements-screen-shooter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,6 @@
|
|
|
1
1
|
import type { WdioBrowser } from "../../../types";
|
|
2
|
-
|
|
2
|
+
interface WaitForSelectorsToSettleOptions {
|
|
3
|
+
needsCompatLib?: boolean;
|
|
4
|
+
}
|
|
5
|
+
export declare function waitForSelectorsToSettle(browser: WdioBrowser, selectors: string[], options?: WaitForSelectorsToSettleOptions): Promise<void>;
|
|
6
|
+
export {};
|
|
@@ -10,13 +10,13 @@ const debug = (0, debug_1.default)("testplane:screenshots:selectors-settle");
|
|
|
10
10
|
const SELECTORS_SETTLE_BROWSER_TIMEOUT_MS = 3000;
|
|
11
11
|
const SELECTORS_SETTLE_FALLBACK_INTERVAL_MS = 50;
|
|
12
12
|
const SELECTORS_SETTLE_FALLBACK_ATTEMPTS = 5;
|
|
13
|
-
async function waitForSelectorsToSettle(browser, selectors) {
|
|
13
|
+
async function waitForSelectorsToSettle(browser, selectors, options = {}) {
|
|
14
14
|
try {
|
|
15
|
-
const settleResult = await waitForSelectorsToSettleInBrowser(browser, selectors);
|
|
16
|
-
if (
|
|
15
|
+
const settleResult = await waitForSelectorsToSettleInBrowser(browser, selectors, options);
|
|
16
|
+
if (settleResult.success) {
|
|
17
17
|
return;
|
|
18
18
|
}
|
|
19
|
-
debug("Browser-side waitForSelectorsToSettle
|
|
19
|
+
debug("Browser-side waitForSelectorsToSettle cannot run, using Node-side polling");
|
|
20
20
|
}
|
|
21
21
|
catch (err) {
|
|
22
22
|
const scriptTimeoutError = err;
|
|
@@ -31,9 +31,11 @@ async function waitForSelectorsToSettle(browser, selectors) {
|
|
|
31
31
|
await waitForSelectorsToSettleInNode(browser, selectors);
|
|
32
32
|
}
|
|
33
33
|
exports.waitForSelectorsToSettle = waitForSelectorsToSettle;
|
|
34
|
-
async function waitForSelectorsToSettleInBrowser(browser, selectors) {
|
|
35
|
-
|
|
36
|
-
|
|
34
|
+
async function waitForSelectorsToSettleInBrowser(browser, selectors, options) {
|
|
35
|
+
if (options.needsCompatLib) {
|
|
36
|
+
return { success: false };
|
|
37
|
+
}
|
|
38
|
+
const originalScriptTimeout = typeof browser.getTimeouts === "function" ? (await browser.getTimeouts())?.script : undefined;
|
|
37
39
|
const shouldRestoreScriptTimeout = typeof originalScriptTimeout === "number";
|
|
38
40
|
let executionError = null;
|
|
39
41
|
let result;
|
|
@@ -50,10 +52,10 @@ async function waitForSelectorsToSettleInBrowser(browser, selectors) {
|
|
|
50
52
|
setTimeoutSource = typeof setTimeout === "function" ? Function.prototype.toString.call(setTimeout) : "";
|
|
51
53
|
}
|
|
52
54
|
catch {
|
|
53
|
-
return {
|
|
55
|
+
return { success: false };
|
|
54
56
|
}
|
|
55
57
|
if (!setTimeoutSource.includes("[native code]")) {
|
|
56
|
-
return {
|
|
58
|
+
return { success: false };
|
|
57
59
|
}
|
|
58
60
|
const PAGE_SETTLE_MAX_WAIT_MS = 50;
|
|
59
61
|
const PAGE_SETTLE_MAX_ITERATIONS = 500;
|
|
@@ -61,13 +63,24 @@ async function waitForSelectorsToSettleInBrowser(browser, selectors) {
|
|
|
61
63
|
const startedAt = performance.now();
|
|
62
64
|
let iterations = 0;
|
|
63
65
|
let matches = 0;
|
|
64
|
-
let lastBoundingClientRects = selectors.map(selector =>
|
|
66
|
+
let lastBoundingClientRects = selectors.map(selector => {
|
|
67
|
+
const element = document.querySelector(selector);
|
|
68
|
+
return element ? element.getBoundingClientRect() : null;
|
|
69
|
+
});
|
|
65
70
|
while (performance.now() - startedAt < PAGE_SETTLE_MAX_WAIT_MS &&
|
|
66
71
|
iterations < PAGE_SETTLE_MAX_ITERATIONS &&
|
|
67
72
|
matches < PAGE_SETTLE_MATCHES_THRESHOLD) {
|
|
68
|
-
const currentBoundingClientRects = selectors.map(selector =>
|
|
69
|
-
|
|
70
|
-
|
|
73
|
+
const currentBoundingClientRects = selectors.map(selector => {
|
|
74
|
+
const element = document.querySelector(selector);
|
|
75
|
+
return element ? element.getBoundingClientRect() : null;
|
|
76
|
+
});
|
|
77
|
+
if (currentBoundingClientRects.every((rect, index) => {
|
|
78
|
+
const lastRect = lastBoundingClientRects[index];
|
|
79
|
+
if (!rect || !lastRect) {
|
|
80
|
+
return rect === lastRect;
|
|
81
|
+
}
|
|
82
|
+
return rect.top === lastRect.top && rect.height === lastRect.height;
|
|
83
|
+
})) {
|
|
71
84
|
matches++;
|
|
72
85
|
}
|
|
73
86
|
else {
|
|
@@ -77,7 +90,7 @@ async function waitForSelectorsToSettleInBrowser(browser, selectors) {
|
|
|
77
90
|
iterations++;
|
|
78
91
|
await new Promise(resolve => setTimeout(resolve, 5));
|
|
79
92
|
}
|
|
80
|
-
return {
|
|
93
|
+
return { success: true };
|
|
81
94
|
}, selectors);
|
|
82
95
|
}
|
|
83
96
|
catch (err) {
|
|
@@ -99,7 +112,7 @@ async function waitForSelectorsToSettleInBrowser(browser, selectors) {
|
|
|
99
112
|
if (executionError) {
|
|
100
113
|
throw executionError;
|
|
101
114
|
}
|
|
102
|
-
return result ?? {
|
|
115
|
+
return result ?? { success: true };
|
|
103
116
|
}
|
|
104
117
|
async function waitForSelectorsToSettleInNode(browser, selectors) {
|
|
105
118
|
const PAGE_SETTLE_MATCHES_THRESHOLD = 3;
|
|
@@ -113,9 +126,10 @@ async function waitForSelectorsToSettleInNode(browser, selectors) {
|
|
|
113
126
|
});
|
|
114
127
|
}
|
|
115
128
|
const previousBoundingClientRects = lastBoundingClientRects;
|
|
116
|
-
const currentBoundingClientRects = await browser.execute(selectors
|
|
117
|
-
return selectors.map((selector)
|
|
118
|
-
const
|
|
129
|
+
const currentBoundingClientRects = await browser.execute(function (selectors) {
|
|
130
|
+
return selectors.map(function (selector) {
|
|
131
|
+
const element = document.querySelector(selector);
|
|
132
|
+
const rect = element ? element.getBoundingClientRect() : null;
|
|
119
133
|
return rect ? { top: rect.top, height: rect.height } : null;
|
|
120
134
|
});
|
|
121
135
|
}, selectors);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wait-for-selectors-to-settle.js","sourceRoot":"","sources":["../../../../../src/browser/screen-shooter/operations/wait-for-selectors-to-settle.ts"],"names":[],"mappings":";;;;;;AAAA,6CAA2D;AAC3D,kDAA8B;AAG9B,MAAM,KAAK,GAAG,IAAA,eAAS,EAAC,wCAAwC,CAAC,CAAC;AAClE,MAAM,mCAAmC,GAAG,IAAI,CAAC;AACjD,MAAM,qCAAqC,GAAG,EAAE,CAAC;AACjD,MAAM,kCAAkC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"wait-for-selectors-to-settle.js","sourceRoot":"","sources":["../../../../../src/browser/screen-shooter/operations/wait-for-selectors-to-settle.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@ exports.getChromiumBuildId = getChromiumBuildId;
|
|
|
18
18
|
const getChromeDriverArchiveUrl = (version) => {
|
|
19
19
|
const chromeDriverArchiveName = {
|
|
20
20
|
linux: "linux64",
|
|
21
|
+
linux_arm: "linux64", // eslint-disable-line camelcase
|
|
21
22
|
mac: "mac64",
|
|
22
23
|
mac_arm: "mac64_m1", // eslint-disable-line camelcase
|
|
23
24
|
win32: "win32",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/browser-installer/chromium/utils.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,wDAA0B;AAC1B,kDAAsD;AACtD,oCAA2D;AAC3D,4CAAmG;AAE5F,MAAM,kBAAkB,GAAG,KAAK,EAAE,QAAyB,EAAE,SAA0B,EAAmB,EAAE;IAC/G,MAAM,SAAS,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,6BAA6B,QAAQ,OAAO,CAAC,CAAC,CAAC;IAEnG,OAAO,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;AACxC,CAAC,CAAC;AAJW,QAAA,kBAAkB,sBAI7B;AAEK,MAAM,yBAAyB,GAAG,CAAC,OAAe,EAAU,EAAE;IACjE,MAAM,uBAAuB,GAAoC;QAC7D,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,OAAO;QACZ,OAAO,EAAE,UAAU,EAAE,gCAAgC;QACrD,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,OAAO;KACjB,CAAC;IAEF,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,OAAO,CAAC,CAAC;IACxC,MAAM,QAAQ,GAAG,IAAA,yBAAiB,EAAC,OAAO,CAAC,CAAC;IAC5C,MAAM,WAAW,GACb,QAAQ,KAAK,0BAAe,CAAC,OAAO,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,qDAAyC,CAAC;IAC3G,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IAClF,MAAM,UAAU,GAAG,GAAG,oCAAwB,IAAI,OAAO,iBAAiB,WAAW,MAAM,CAAC;IAE5F,OAAO,UAAU,CAAC;AACtB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/browser-installer/chromium/utils.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,wDAA0B;AAC1B,kDAAsD;AACtD,oCAA2D;AAC3D,4CAAmG;AAE5F,MAAM,kBAAkB,GAAG,KAAK,EAAE,QAAyB,EAAE,SAA0B,EAAmB,EAAE;IAC/G,MAAM,SAAS,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,6BAA6B,QAAQ,OAAO,CAAC,CAAC,CAAC;IAEnG,OAAO,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;AACxC,CAAC,CAAC;AAJW,QAAA,kBAAkB,sBAI7B;AAEK,MAAM,yBAAyB,GAAG,CAAC,OAAe,EAAU,EAAE;IACjE,MAAM,uBAAuB,GAAoC;QAC7D,KAAK,EAAE,SAAS;QAChB,SAAS,EAAE,SAAS,EAAE,gCAAgC;QACtD,GAAG,EAAE,OAAO;QACZ,OAAO,EAAE,UAAU,EAAE,gCAAgC;QACrD,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,OAAO;KACjB,CAAC;IAEF,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,OAAO,CAAC,CAAC;IACxC,MAAM,QAAQ,GAAG,IAAA,yBAAiB,EAAC,OAAO,CAAC,CAAC;IAC5C,MAAM,WAAW,GACb,QAAQ,KAAK,0BAAe,CAAC,OAAO,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,qDAAyC,CAAC;IAC3G,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IAClF,MAAM,UAAU,GAAG,GAAG,oCAAwB,IAAI,OAAO,iBAAiB,WAAW,MAAM,CAAC;IAE5F,OAAO,UAAU,CAAC;AACtB,CAAC,CAAC;AAlBW,QAAA,yBAAyB,6BAkBpC;AAEK,MAAM,6BAA6B,GAAG,CAAC,OAAe,EAAU,EAAE;IACrE,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAEzE,OAAO,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,MAAM,EAAE,EAAE,gBAAgB,OAAO,IAAI,YAAY,MAAM,CAAC,CAAC;AACjF,CAAC,CAAC;AAJW,QAAA,6BAA6B,iCAIxC"}
|