webdriverio 9.0.0-alpha.10 → 9.0.0-alpha.113
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/cjs/index.js +0 -1
- package/build/commands/browser/$$.js +0 -1
- package/build/commands/browser/$.d.ts.map +1 -1
- package/build/commands/browser/$.js +10 -20
- package/build/commands/browser/action.js +0 -1
- package/build/commands/browser/actions.js +0 -1
- package/build/commands/browser/addCommand.js +0 -1
- package/build/commands/browser/call.js +0 -1
- package/build/commands/browser/custom$$.js +0 -1
- package/build/commands/browser/custom$.js +0 -1
- package/build/commands/browser/debug.js +0 -1
- package/build/commands/browser/deleteCookies.js +0 -1
- package/build/commands/browser/emulate.d.ts +6 -0
- package/build/commands/browser/emulate.d.ts.map +1 -1
- package/build/commands/browser/emulate.js +6 -1
- package/build/commands/browser/execute.js +0 -1
- package/build/commands/browser/executeAsync.js +0 -1
- package/build/commands/browser/getCookies.js +0 -1
- package/build/commands/browser/getPuppeteer.js +0 -1
- package/build/commands/browser/getWindowSize.js +0 -1
- package/build/commands/browser/keys.js +0 -1
- package/build/commands/browser/mock.d.ts +4 -7
- package/build/commands/browser/mock.d.ts.map +1 -1
- package/build/commands/browser/mock.js +4 -44
- package/build/commands/browser/mockClearAll.js +0 -1
- package/build/commands/browser/mockRestoreAll.js +0 -1
- package/build/commands/browser/newWindow.js +0 -1
- package/build/commands/browser/overwriteCommand.js +0 -1
- package/build/commands/browser/pause.js +0 -1
- package/build/commands/browser/react$$.js +0 -1
- package/build/commands/browser/react$.js +0 -1
- package/build/commands/browser/reloadSession.js +0 -1
- package/build/commands/browser/savePDF.js +0 -1
- package/build/commands/browser/saveRecordingScreen.js +0 -1
- package/build/commands/browser/saveScreenshot.js +0 -1
- package/build/commands/browser/scroll.js +0 -1
- package/build/commands/browser/setCookies.js +0 -1
- package/build/commands/browser/setTimeout.js +0 -1
- package/build/commands/browser/setWindowSize.js +0 -1
- package/build/commands/browser/switchWindow.js +0 -1
- package/build/commands/browser/throttle.d.ts +1 -1
- package/build/commands/browser/throttle.d.ts.map +1 -1
- package/build/commands/browser/throttle.js +0 -1
- package/build/commands/browser/throttleCPU.js +0 -1
- package/build/commands/browser/throttleNetwork.d.ts +1 -1
- package/build/commands/browser/throttleNetwork.d.ts.map +1 -1
- package/build/commands/browser/throttleNetwork.js +0 -1
- package/build/commands/browser/touchAction.js +0 -1
- package/build/commands/browser/uploadFile.js +0 -1
- package/build/commands/browser/url.js +0 -1
- package/build/commands/browser/waitUntil.js +0 -1
- package/build/commands/browser.js +0 -1
- package/build/commands/constant.js +0 -1
- package/build/commands/element/$$.js +0 -1
- package/build/commands/element/$.js +0 -1
- package/build/commands/element/addValue.js +0 -1
- package/build/commands/element/clearValue.js +0 -1
- package/build/commands/element/click.js +0 -1
- package/build/commands/element/custom$$.js +0 -1
- package/build/commands/element/custom$.js +0 -1
- package/build/commands/element/doubleClick.js +0 -1
- package/build/commands/element/dragAndDrop.js +0 -1
- package/build/commands/element/execute.d.ts +0 -1
- package/build/commands/element/execute.d.ts.map +1 -1
- package/build/commands/element/execute.js +0 -1
- package/build/commands/element/executeAsync.d.ts +0 -1
- package/build/commands/element/executeAsync.d.ts.map +1 -1
- package/build/commands/element/executeAsync.js +0 -1
- package/build/commands/element/getAttribute.js +0 -1
- package/build/commands/element/getCSSProperty.d.ts +1 -1
- package/build/commands/element/getCSSProperty.d.ts.map +1 -1
- package/build/commands/element/getCSSProperty.js +0 -1
- package/build/commands/element/getComputedLabel.js +0 -1
- package/build/commands/element/getComputedRole.js +0 -1
- package/build/commands/element/getHTML.d.ts.map +1 -1
- package/build/commands/element/getHTML.js +30 -51
- package/build/commands/element/getLocation.js +0 -1
- package/build/commands/element/getProperty.js +0 -1
- package/build/commands/element/getSize.js +0 -1
- package/build/commands/element/getTagName.js +0 -1
- package/build/commands/element/getText.js +0 -1
- package/build/commands/element/getValue.js +0 -1
- package/build/commands/element/isClickable.js +0 -1
- package/build/commands/element/isDisplayed.js +0 -1
- package/build/commands/element/isEnabled.js +0 -1
- package/build/commands/element/isEqual.js +0 -1
- package/build/commands/element/isExisting.js +0 -1
- package/build/commands/element/isFocused.js +0 -1
- package/build/commands/element/isSelected.js +0 -1
- package/build/commands/element/isStable.js +0 -1
- package/build/commands/element/moveTo.js +0 -1
- package/build/commands/element/nextElement.d.ts +1 -1
- package/build/commands/element/nextElement.d.ts.map +1 -1
- package/build/commands/element/nextElement.js +0 -1
- package/build/commands/element/parentElement.d.ts +1 -1
- package/build/commands/element/parentElement.d.ts.map +1 -1
- package/build/commands/element/parentElement.js +0 -1
- package/build/commands/element/previousElement.d.ts +1 -1
- package/build/commands/element/previousElement.d.ts.map +1 -1
- package/build/commands/element/previousElement.js +0 -1
- package/build/commands/element/react$$.js +0 -1
- package/build/commands/element/react$.js +0 -1
- package/build/commands/element/saveScreenshot.js +0 -1
- package/build/commands/element/scrollIntoView.js +0 -1
- package/build/commands/element/selectByAttribute.js +0 -1
- package/build/commands/element/selectByIndex.js +0 -1
- package/build/commands/element/selectByVisibleText.js +0 -1
- package/build/commands/element/setValue.js +0 -1
- package/build/commands/element/shadow$$.js +0 -1
- package/build/commands/element/shadow$.js +0 -1
- package/build/commands/element/touchAction.js +0 -1
- package/build/commands/element/waitForClickable.js +0 -1
- package/build/commands/element/waitForDisplayed.js +0 -1
- package/build/commands/element/waitForEnabled.js +0 -1
- package/build/commands/element/waitForExist.js +0 -1
- package/build/commands/element/waitForStable.js +0 -1
- package/build/commands/element/waitUntil.js +0 -1
- package/build/commands/element.js +0 -1
- package/build/commands/mock/abort.js +0 -1
- package/build/commands/mock/abortOnce.js +0 -1
- package/build/commands/mock/clear.js +0 -1
- package/build/commands/mock/respond.js +0 -1
- package/build/commands/mock/respondOnce.js +0 -1
- package/build/commands/mock/restore.js +0 -1
- package/build/constants.js +0 -1
- package/build/index.d.ts +3 -5
- package/build/index.d.ts.map +1 -1
- package/build/index.js +3 -3
- package/build/middlewares.d.ts.map +1 -1
- package/build/middlewares.js +0 -1
- package/build/multiremote.js +0 -1
- package/build/protocol-stub.js +0 -1
- package/build/scripts/customElement.d.ts.map +1 -1
- package/build/scripts/customElement.js +6 -3
- package/build/scripts/getHTML.js +0 -1
- package/build/scripts/getHTMLShadow.d.ts +11 -8
- package/build/scripts/getHTMLShadow.d.ts.map +1 -1
- package/build/scripts/getHTMLShadow.js +20 -31
- package/build/scripts/getProperty.js +0 -1
- package/build/scripts/isDescendant.js +0 -1
- package/build/scripts/isElementClickable.js +0 -1
- package/build/scripts/isElementDisplayed.js +0 -1
- package/build/scripts/isElementInViewport.js +0 -1
- package/build/scripts/isElementStable.js +0 -1
- package/build/scripts/isFocused.js +0 -1
- package/build/scripts/newWindow.js +0 -1
- package/build/scripts/resq.js +0 -1
- package/build/scripts/shadowFnFactory.js +0 -1
- package/build/shadowRoot.d.ts +25 -15
- package/build/shadowRoot.d.ts.map +1 -1
- package/build/shadowRoot.js +153 -49
- package/build/types.d.ts +29 -37
- package/build/types.d.ts.map +1 -1
- package/build/types.js +0 -1
- package/build/utils/SevereServiceError.js +0 -1
- package/build/utils/Timer.js +0 -1
- package/build/utils/actions/base.js +0 -1
- package/build/utils/actions/index.js +0 -1
- package/build/utils/actions/key.js +0 -1
- package/build/utils/actions/pointer.js +0 -1
- package/build/utils/actions/wheel.js +0 -1
- package/build/utils/detectBackend.js +0 -1
- package/build/utils/driver.js +0 -1
- package/build/utils/findStrategy.js +0 -1
- package/build/utils/getElementObject.d.ts +3 -3
- package/build/utils/getElementObject.d.ts.map +1 -1
- package/build/utils/getElementObject.js +20 -11
- package/build/utils/implicitWait.js +0 -1
- package/build/utils/index.d.ts +2 -8
- package/build/utils/index.d.ts.map +1 -1
- package/build/utils/index.js +71 -96
- package/build/utils/interception/index.d.ts +76 -22
- package/build/utils/interception/index.d.ts.map +1 -1
- package/build/utils/interception/index.js +297 -26
- package/build/utils/interception/types.d.ts +18 -85
- package/build/utils/interception/types.d.ts.map +1 -1
- package/build/utils/interception/types.js +0 -1
- package/build/utils/interception/utils.d.ts +17 -0
- package/build/utils/interception/utils.d.ts.map +1 -0
- package/build/utils/interception/utils.js +87 -0
- package/build/utils/refetchElement.d.ts.map +1 -1
- package/build/utils/refetchElement.js +6 -3
- package/build/utils/thirdParty/querySelectorShadowDom.js +0 -1
- package/package.json +11 -9
- package/build/utils/interception/devtools.d.ts +0 -64
- package/build/utils/interception/devtools.d.ts.map +0 -1
- package/build/utils/interception/devtools.js +0 -268
- package/build/utils/interception/webdriver.d.ts +0 -49
- package/build/utils/interception/webdriver.d.ts.map +0 -1
- package/build/utils/interception/webdriver.js +0 -76
|
@@ -1,32 +1,293 @@
|
|
|
1
|
+
/* eslint-disable no-dupe-class-members */
|
|
1
2
|
import EventEmitter from 'node:events';
|
|
2
|
-
import
|
|
3
|
+
import logger from '@wdio/logger';
|
|
4
|
+
import { URLPattern } from 'urlpattern-polyfill';
|
|
3
5
|
import Timer from '../Timer.js';
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
6
|
+
import { parseOverwrite, getPatternParam } from './utils.js';
|
|
7
|
+
import { SESSION_MOCKS } from '../../commands/browser/mock.js';
|
|
8
|
+
const log = logger('WebDriverInterception');
|
|
9
|
+
let hasSubscribedToEvents = false;
|
|
10
|
+
/**
|
|
11
|
+
* Network interception class based on a WebDriver Bidi implementation.
|
|
12
|
+
*
|
|
13
|
+
* Note: this code is executed in Node.js and in the browser, so make sure
|
|
14
|
+
* you use primitives that work in both environments.
|
|
15
|
+
*/
|
|
16
|
+
export default class WebDriverInterception {
|
|
17
|
+
#pattern;
|
|
18
|
+
#mockId;
|
|
19
|
+
#browser;
|
|
20
|
+
#emitter = new EventEmitter();
|
|
21
|
+
#restored = false;
|
|
22
|
+
#respondOverwrites = [];
|
|
23
|
+
#calls = [];
|
|
24
|
+
constructor(pattern, mockId, browser) {
|
|
25
|
+
this.#pattern = pattern;
|
|
26
|
+
this.#mockId = mockId;
|
|
27
|
+
this.#browser = browser;
|
|
28
|
+
/**
|
|
29
|
+
* attach network listener to this mock
|
|
30
|
+
*/
|
|
31
|
+
browser.on('network.beforeRequestSent', this.#handleBeforeRequestSent.bind(this));
|
|
32
|
+
browser.on('network.responseStarted', this.#handleResponseStarted.bind(this));
|
|
33
|
+
}
|
|
34
|
+
static async initiate(url,
|
|
35
|
+
/**
|
|
36
|
+
* ToDo(Christian): incorporate filterOptions
|
|
37
|
+
*/
|
|
38
|
+
filterOptions, browser) {
|
|
39
|
+
const pattern = parseUrlPattern(url);
|
|
40
|
+
if (!hasSubscribedToEvents) {
|
|
41
|
+
await browser.sessionSubscribe({
|
|
42
|
+
events: [
|
|
43
|
+
'network.beforeRequestSent',
|
|
44
|
+
'network.responseStarted'
|
|
45
|
+
]
|
|
46
|
+
});
|
|
47
|
+
log.info('subscribed to network events');
|
|
48
|
+
hasSubscribedToEvents = true;
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* register network intercept
|
|
52
|
+
*/
|
|
53
|
+
const interception = await browser.networkAddIntercept({
|
|
54
|
+
phases: ['beforeRequestSent', 'responseStarted'],
|
|
55
|
+
urlPatterns: [{
|
|
56
|
+
type: 'pattern',
|
|
57
|
+
protocol: getPatternParam(pattern, 'protocol'),
|
|
58
|
+
hostname: getPatternParam(pattern, 'hostname'),
|
|
59
|
+
pathname: getPatternParam(pattern, 'pathname'),
|
|
60
|
+
port: getPatternParam(pattern, 'port'),
|
|
61
|
+
search: getPatternParam(pattern, 'search')
|
|
62
|
+
}]
|
|
63
|
+
});
|
|
64
|
+
return new WebDriverInterception(pattern, interception.intercept, browser);
|
|
65
|
+
}
|
|
66
|
+
#handleBeforeRequestSent(request) {
|
|
67
|
+
/**
|
|
68
|
+
* don't do anything if:
|
|
69
|
+
* - request is not blocked
|
|
70
|
+
* - request is not matching the pattern, e.g. a different mock is responsible for this request
|
|
71
|
+
*/
|
|
72
|
+
if (!this.#isRequestMatching(request)) {
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
75
|
+
/**
|
|
76
|
+
* continue the request without modifications, if:
|
|
77
|
+
*/
|
|
78
|
+
const continueRequest = (
|
|
79
|
+
/**
|
|
80
|
+
* - mock has no request/respond overwrites
|
|
81
|
+
* - no request modifications are set
|
|
82
|
+
* - no errorReason is set
|
|
83
|
+
* - no requestWith is set
|
|
84
|
+
*/
|
|
85
|
+
this.#respondOverwrites.length === 0 ||
|
|
86
|
+
(!this.#respondOverwrites[0].abort &&
|
|
87
|
+
!this.#respondOverwrites[0].requestWith));
|
|
88
|
+
/**
|
|
89
|
+
* check if request matches the mock url
|
|
90
|
+
*/
|
|
91
|
+
if (continueRequest) {
|
|
92
|
+
this.#emitter.emit('continue', request.request.request);
|
|
93
|
+
return this.#browser.networkContinueRequest({
|
|
94
|
+
request: request.request.request
|
|
95
|
+
});
|
|
96
|
+
}
|
|
97
|
+
this.#emitter.emit('request', request);
|
|
98
|
+
const { requestWith, abort } = this.#respondOverwrites[0].once
|
|
99
|
+
? this.#respondOverwrites.shift() || {}
|
|
100
|
+
: this.#respondOverwrites[0];
|
|
101
|
+
/**
|
|
102
|
+
* check if should abort the request
|
|
103
|
+
*/
|
|
104
|
+
if (abort) {
|
|
105
|
+
this.#emitter.emit('fail', request.request.request);
|
|
106
|
+
return this.#browser.networkFailRequest({ request: request.request.request });
|
|
107
|
+
}
|
|
108
|
+
/**
|
|
109
|
+
* continue request (possibly with overwrites)
|
|
110
|
+
*/
|
|
111
|
+
if (requestWith) {
|
|
112
|
+
this.#emitter.emit('overwrite', request);
|
|
113
|
+
return this.#browser.networkContinueRequest({
|
|
114
|
+
request: request.request.request,
|
|
115
|
+
...parseOverwrite(requestWith, request)
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
throw new Error('This should never happen');
|
|
119
|
+
}
|
|
120
|
+
#handleResponseStarted(request) {
|
|
121
|
+
/**
|
|
122
|
+
* don't do anything if:
|
|
123
|
+
* - request is not blocked
|
|
124
|
+
* - request is not matching the pattern, e.g. a different mock is responsible for this request
|
|
125
|
+
*/
|
|
126
|
+
if (!this.#isRequestMatching(request)) {
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
/**
|
|
130
|
+
* continue the request without modifications, if:
|
|
131
|
+
*/
|
|
132
|
+
const continueRequest = (
|
|
133
|
+
/**
|
|
134
|
+
* - mock has no request/respond overwrites
|
|
135
|
+
* - no request modifications are set, e.g. no overwrite is set
|
|
136
|
+
*/
|
|
137
|
+
this.#respondOverwrites.length === 0 ||
|
|
138
|
+
!this.#respondOverwrites[0].overwrite);
|
|
139
|
+
/**
|
|
140
|
+
* check if request matches the mock url
|
|
141
|
+
*/
|
|
142
|
+
if (continueRequest) {
|
|
143
|
+
this.#emitter.emit('continue', request.request.request);
|
|
144
|
+
return this.#browser.networkProvideResponse({
|
|
145
|
+
request: request.request.request
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
this.#calls.push(request);
|
|
149
|
+
const { overwrite } = this.#respondOverwrites[0].once
|
|
150
|
+
? this.#respondOverwrites.shift() || {}
|
|
151
|
+
: this.#respondOverwrites[0];
|
|
152
|
+
/**
|
|
153
|
+
* continue request (possibly with overwrites)
|
|
154
|
+
*/
|
|
155
|
+
if (overwrite) {
|
|
156
|
+
this.#emitter.emit('overwrite', request);
|
|
157
|
+
return this.#browser.networkProvideResponse({
|
|
158
|
+
request: request.request.request,
|
|
159
|
+
...parseOverwrite(overwrite, request)
|
|
160
|
+
});
|
|
161
|
+
}
|
|
162
|
+
/**
|
|
163
|
+
* continue request as is
|
|
164
|
+
*/
|
|
165
|
+
this.#emitter.emit('continue', request.request.request);
|
|
166
|
+
return this.#browser.networkProvideResponse({
|
|
167
|
+
request: request.request.request
|
|
168
|
+
});
|
|
169
|
+
}
|
|
170
|
+
#isRequestMatching(request) {
|
|
171
|
+
return request.isBlocked && this.#pattern && this.#pattern.test(request.request.url);
|
|
172
|
+
}
|
|
173
|
+
/**
|
|
174
|
+
* allows access to all requests made with given pattern
|
|
175
|
+
*/
|
|
176
|
+
get calls() {
|
|
177
|
+
return this.#calls;
|
|
178
|
+
}
|
|
179
|
+
/**
|
|
180
|
+
* Resets all information stored in the `mock.calls` set.
|
|
181
|
+
*/
|
|
182
|
+
clear() {
|
|
183
|
+
this.#calls = [];
|
|
184
|
+
return this;
|
|
185
|
+
}
|
|
186
|
+
/**
|
|
187
|
+
* Does what `mock.clear()` does and makes removes custom request overrides
|
|
188
|
+
* and response overwrites
|
|
189
|
+
*/
|
|
190
|
+
reset() {
|
|
191
|
+
this.clear();
|
|
192
|
+
this.#respondOverwrites = [];
|
|
193
|
+
return this;
|
|
194
|
+
}
|
|
195
|
+
/**
|
|
196
|
+
* Does everything that `mock.reset()` does, and also
|
|
197
|
+
* removes any mocked return values or implementations.
|
|
198
|
+
* Restored mock does not emit events and could not mock responses
|
|
199
|
+
*/
|
|
200
|
+
async restore() {
|
|
201
|
+
this.reset();
|
|
202
|
+
this.#respondOverwrites = [];
|
|
203
|
+
this.#restored = true;
|
|
204
|
+
const handle = await this.#browser.getWindowHandle();
|
|
205
|
+
log.trace(`Restoring mock for ${handle}`);
|
|
206
|
+
SESSION_MOCKS[handle].delete(this);
|
|
207
|
+
if (this.#mockId) {
|
|
208
|
+
await this.#browser.networkRemoveIntercept({ intercept: this.#mockId });
|
|
209
|
+
}
|
|
210
|
+
return this;
|
|
211
|
+
}
|
|
212
|
+
/**
|
|
213
|
+
* Always respond with same overwrite
|
|
214
|
+
* @param {*} overwrites payload to overwrite the response
|
|
215
|
+
* @param {*} params additional respond parameters to overwrite
|
|
216
|
+
* @param {boolean} once apply overwrite only once for the next request
|
|
217
|
+
*/
|
|
218
|
+
respond(payload, params = {}, once) {
|
|
219
|
+
this.#ensureNotRestored();
|
|
220
|
+
const body = typeof payload === 'string'
|
|
221
|
+
? payload
|
|
222
|
+
: globalThis.Buffer && globalThis.Buffer.isBuffer(payload)
|
|
223
|
+
? payload.toString('base64')
|
|
224
|
+
: JSON.stringify(payload);
|
|
225
|
+
const overwrite = { body, ...params };
|
|
226
|
+
this.#respondOverwrites.push({ overwrite, once });
|
|
227
|
+
return this;
|
|
228
|
+
}
|
|
229
|
+
/**
|
|
230
|
+
* alias for `mock.respond(…, true)`
|
|
231
|
+
*/
|
|
232
|
+
respondOnce(payload, params = {}) {
|
|
233
|
+
return this.respond(payload, params, true);
|
|
234
|
+
}
|
|
235
|
+
/**
|
|
236
|
+
* Abort the request with an error code
|
|
237
|
+
* @param {string} errorReason error code of the response
|
|
238
|
+
* @param {boolean} once if request should be aborted only once for the next request
|
|
239
|
+
*/
|
|
240
|
+
abort(once) {
|
|
241
|
+
this.#ensureNotRestored();
|
|
242
|
+
this.#respondOverwrites.push({ abort: true, once });
|
|
243
|
+
return this;
|
|
244
|
+
}
|
|
245
|
+
/**
|
|
246
|
+
* alias for `mock.abort(true)`
|
|
247
|
+
*/
|
|
248
|
+
abortOnce() {
|
|
249
|
+
return this.abort(true);
|
|
250
|
+
}
|
|
251
|
+
/**
|
|
252
|
+
* Redirect request to another URL
|
|
253
|
+
* @param {string} redirectUrl URL to redirect to
|
|
254
|
+
* @param {boolean} sticky if request should be redirected for all following requests
|
|
255
|
+
*/
|
|
256
|
+
redirect(redirectUrl, once) {
|
|
257
|
+
this.#ensureNotRestored();
|
|
258
|
+
const requestWith = { url: redirectUrl };
|
|
259
|
+
this.#respondOverwrites.push({ requestWith, once });
|
|
260
|
+
return this;
|
|
261
|
+
}
|
|
262
|
+
/**
|
|
263
|
+
* alias for `mock.redirect(…, true)`
|
|
264
|
+
*/
|
|
265
|
+
redirectOnce(redirectUrl) {
|
|
266
|
+
return this.redirect(redirectUrl, true);
|
|
267
|
+
}
|
|
268
|
+
on(event, callback) {
|
|
269
|
+
this.#emitter.on(event, callback);
|
|
270
|
+
return this;
|
|
271
|
+
}
|
|
272
|
+
#ensureNotRestored() {
|
|
273
|
+
if (this.#restored) {
|
|
274
|
+
throw new Error('This can\'t be done on restored mock');
|
|
275
|
+
}
|
|
276
|
+
}
|
|
277
|
+
waitForResponse({ timeout = this.#browser.options.waitforTimeout, interval = this.#browser.options.waitforInterval, timeoutMsg, } = {}) {
|
|
17
278
|
/*!
|
|
18
279
|
* ensure that timeout and interval are set properly
|
|
19
280
|
*/
|
|
20
281
|
if (typeof timeout !== 'number') {
|
|
21
|
-
timeout = this
|
|
282
|
+
timeout = this.#browser.options.waitforTimeout;
|
|
22
283
|
}
|
|
23
284
|
if (typeof interval !== 'number') {
|
|
24
|
-
interval = this
|
|
285
|
+
interval = this.#browser.options.waitforInterval;
|
|
25
286
|
}
|
|
26
287
|
/* istanbul ignore next */
|
|
27
288
|
const fn = async () => this.calls && (await this.calls).length > 0;
|
|
28
289
|
const timer = new Timer(interval, timeout, fn, true);
|
|
29
|
-
return this
|
|
290
|
+
return this.#browser.call(() => timer.catch((e) => {
|
|
30
291
|
if (e.message === 'timeout') {
|
|
31
292
|
if (typeof timeoutMsg === 'string') {
|
|
32
293
|
throw new Error(timeoutMsg);
|
|
@@ -36,14 +297,24 @@ export default class Interception extends EventEmitter {
|
|
|
36
297
|
throw new Error(`waitForResponse failed with the following reason: ${(e && e.message) || e}`);
|
|
37
298
|
}));
|
|
38
299
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
300
|
+
}
|
|
301
|
+
export function parseUrlPattern(url) {
|
|
302
|
+
/**
|
|
303
|
+
* return early if it's already a URLPattern
|
|
304
|
+
*/
|
|
305
|
+
if (typeof url === 'object') {
|
|
306
|
+
return url;
|
|
307
|
+
}
|
|
308
|
+
/**
|
|
309
|
+
* parse URLPattern from absolute URL
|
|
310
|
+
*/
|
|
311
|
+
if (url.startsWith('http')) {
|
|
312
|
+
return new URLPattern(url);
|
|
47
313
|
}
|
|
314
|
+
/**
|
|
315
|
+
* parse URLPattern from relative URL
|
|
316
|
+
*/
|
|
317
|
+
return new URLPattern({
|
|
318
|
+
pathname: url
|
|
319
|
+
});
|
|
48
320
|
}
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbHMvaW50ZXJjZXB0aW9uL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sWUFBWSxNQUFNLGFBQWEsQ0FBQTtBQUN0QyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sV0FBVyxDQUFBO0FBRXJDLE9BQU8sS0FBSyxNQUFNLGFBQWEsQ0FBQTtBQUsvQixNQUFNLENBQUMsT0FBTyxPQUFnQixZQUFhLFNBQVEsWUFBWTtJQWtCaEQ7SUFDQTtJQUNBO0lBWFgsaUJBQWlCLEdBS1gsRUFBRSxDQUFBO0lBQ1IsT0FBTyxHQUFjLEVBQUUsQ0FBQTtJQUV2QixZQUNXLEdBQW9CLEVBQ3BCLGdCQUFtQyxFQUFFLEVBQ3JDLE9BQTRCO1FBRW5DLEtBQUssRUFBRSxDQUFBO1FBSkEsUUFBRyxHQUFILEdBQUcsQ0FBaUI7UUFDcEIsa0JBQWEsR0FBYixhQUFhLENBQXdCO1FBQ3JDLFlBQU8sR0FBUCxPQUFPLENBQXFCO0lBR3ZDLENBQUM7SUFFRCxlQUFlLENBQUUsRUFDYixPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsY0FBYyxFQUM3QyxRQUFRLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsZUFBZSxFQUMvQyxVQUFVLE1BQ00sRUFBRTtRQUNsQjs7V0FFRztRQUNILElBQUksT0FBTyxPQUFPLEtBQUssUUFBUSxFQUFFLENBQUM7WUFDOUIsT0FBTyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLGNBQXdCLENBQUE7UUFDM0QsQ0FBQztRQUVELElBQUksT0FBTyxRQUFRLEtBQUssUUFBUSxFQUFFLENBQUM7WUFDL0IsUUFBUSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLGVBQXlCLENBQUE7UUFDN0QsQ0FBQztRQUVELDBCQUEwQjtRQUMxQixNQUFNLEVBQUUsR0FBRyxLQUFLLElBQUksRUFBRSxDQUFDLElBQUksQ0FBQyxLQUFLLElBQUksQ0FBQyxNQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFBO1FBQ2xFLE1BQU0sS0FBSyxHQUFHLElBQUksS0FBSyxDQUFDLFFBQVEsRUFBRSxPQUFPLEVBQUUsRUFBRSxFQUFFLElBQUksQ0FBNEIsQ0FBQTtRQUUvRSxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtZQUM3QyxJQUFJLENBQUMsQ0FBQyxPQUFPLEtBQUssU0FBUyxFQUFFLENBQUM7Z0JBQzFCLElBQUksT0FBTyxVQUFVLEtBQUssUUFBUSxFQUFFLENBQUM7b0JBQ2pDLE1BQU0sSUFBSSxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUE7Z0JBQy9CLENBQUM7Z0JBQ0QsTUFBTSxJQUFJLEtBQUssQ0FBQyxtQ0FBbUMsT0FBTyxJQUFJLENBQUMsQ0FBQTtZQUNuRSxDQUFDO1lBRUQsTUFBTSxJQUFJLEtBQUssQ0FBQyxxREFBcUQsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUE7UUFDakcsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNQLENBQUM7SUFFRCxNQUFNLENBQUMsaUJBQWlCLENBQUUsV0FBNEIsRUFBRSxTQUFpQjtRQUNyRSxJQUFJLE9BQU8sV0FBVyxLQUFLLFFBQVEsRUFBRSxDQUFDO1lBQ2xDLE9BQU8sU0FBUyxDQUFDLFNBQVMsRUFBRSxXQUFXLENBQUMsQ0FBQTtRQUM1QyxDQUFDO1FBQ0QsSUFBSSxXQUFXLFlBQVksTUFBTSxFQUFFLENBQUM7WUFDaEMsT0FBTyxPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFBO1FBQ2hELENBQUM7UUFFRCxNQUFNLElBQUksS0FBSyxDQUFDLGlDQUFpQyxXQUFXLEVBQUUsQ0FBQyxDQUFBO0lBQ25FLENBQUM7Q0FDSiJ9
|
|
@@ -1,80 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
import type {
|
|
3
|
-
import type { JsonCompatible } from '@wdio/types';
|
|
4
|
-
/**
|
|
5
|
-
* HTTP request data. (copied from the puppeteer-core package as there is currently
|
|
6
|
-
* no way to access these types otherwise)
|
|
7
|
-
*/
|
|
8
|
-
export type ResourcePriority = 'VeryLow' | 'Low' | 'Medium' | 'High' | 'VeryHigh';
|
|
9
|
-
export type MixedContentType = 'blockable' | 'optionally-blockable' | 'none';
|
|
10
|
-
export type ReferrerPolicy = 'unsafe-url' | 'no-referrer-when-downgrade' | 'no-referrer' | 'origin' | 'origin-when-cross-origin' | 'same-origin' | 'strict-origin' | 'strict-origin-when-cross-origin';
|
|
11
|
-
export type ErrorReason = 'Failed' | 'Aborted' | 'TimedOut' | 'AccessDenied' | 'ConnectionClosed' | 'ConnectionReset' | 'ConnectionRefused' | 'ConnectionAborted' | 'ConnectionFailed' | 'NameNotResolved' | 'InternetDisconnected' | 'AddressUnreachable' | 'BlockedByClient' | 'BlockedByResponse';
|
|
12
|
-
export interface Request {
|
|
13
|
-
/**
|
|
14
|
-
* Request URL (without fragment).
|
|
15
|
-
*/
|
|
16
|
-
url: string;
|
|
17
|
-
/**
|
|
18
|
-
* Fragment of the requested URL starting with hash, if present.
|
|
19
|
-
*/
|
|
20
|
-
urlFragment?: string;
|
|
21
|
-
/**
|
|
22
|
-
* HTTP request method.
|
|
23
|
-
*/
|
|
24
|
-
method: string;
|
|
25
|
-
/**
|
|
26
|
-
* HTTP request headers.
|
|
27
|
-
*/
|
|
28
|
-
headers: Record<string, string>;
|
|
29
|
-
/**
|
|
30
|
-
* HTTP POST request data.
|
|
31
|
-
*/
|
|
32
|
-
postData?: string;
|
|
33
|
-
/**
|
|
34
|
-
* True when the request has POST data. Note that postData might still be omitted when this flag is true when the data is too long.
|
|
35
|
-
*/
|
|
36
|
-
hasPostData?: boolean;
|
|
37
|
-
/**
|
|
38
|
-
* The mixed content export type of the request.
|
|
39
|
-
*/
|
|
40
|
-
mixedContentType?: MixedContentType;
|
|
41
|
-
/**
|
|
42
|
-
* Priority of the resource request at the time request is sent.
|
|
43
|
-
*/
|
|
44
|
-
initialPriority: ResourcePriority;
|
|
45
|
-
/**
|
|
46
|
-
* The referrer policy of the request, as defined in https://www.w3.org/TR/referrer-policy/
|
|
47
|
-
*/
|
|
48
|
-
referrerPolicy: ReferrerPolicy;
|
|
49
|
-
/**
|
|
50
|
-
* Whether is loaded via link preload.
|
|
51
|
-
*/
|
|
52
|
-
isLinkPreload?: boolean;
|
|
53
|
-
}
|
|
54
|
-
export interface Matches extends Request {
|
|
55
|
-
/**
|
|
56
|
-
* body response of actual resource
|
|
57
|
-
*/
|
|
58
|
-
body: string | Buffer | JsonCompatible;
|
|
59
|
-
/**
|
|
60
|
-
* HTTP response headers.
|
|
61
|
-
*/
|
|
62
|
-
responseHeaders: Record<string, string>;
|
|
63
|
-
/**
|
|
64
|
-
* HTTP response status code.
|
|
65
|
-
*/
|
|
66
|
-
statusCode: number;
|
|
67
|
-
}
|
|
68
|
-
export type MockOverwriteFunction = (request: Matches, client: CDPSession) => Promise<string | Record<string, any>>;
|
|
69
|
-
export type MockOverwrite = string | Record<string, any> | MockOverwriteFunction;
|
|
70
|
-
export type MockResponseParams = {
|
|
71
|
-
statusCode?: number | ((request: Matches) => number);
|
|
72
|
-
headers?: Record<string, string> | ((request: Matches) => Record<string, string>);
|
|
73
|
-
/**
|
|
74
|
-
* fetch real response before responding with mocked data. Default: true
|
|
75
|
-
*/
|
|
76
|
-
fetchResponse?: boolean;
|
|
77
|
-
};
|
|
1
|
+
import type { local } from 'webdriver';
|
|
2
|
+
import type { Cookie } from '@wdio/protocols';
|
|
78
3
|
export type MockFilterOptions = {
|
|
79
4
|
method?: string | ((method: string) => boolean);
|
|
80
5
|
headers?: Record<string, string> | ((headers: Record<string, string>) => boolean);
|
|
@@ -83,13 +8,21 @@ export type MockFilterOptions = {
|
|
|
83
8
|
statusCode?: number | ((statusCode: number) => boolean);
|
|
84
9
|
postData?: string | ((payload: string | undefined) => boolean);
|
|
85
10
|
};
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
export interface
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
11
|
+
type Overwrite<T, Request> = T | ((request: Request) => T);
|
|
12
|
+
type Methods = 'POST' | 'GET' | 'DELETE' | 'PUT' | 'PATCH' | 'OPTIONS' | 'HEAD';
|
|
13
|
+
export interface RequestWithOptions {
|
|
14
|
+
body?: Overwrite<any, local.NetworkBeforeRequestSentParameters>;
|
|
15
|
+
cookies?: Overwrite<Cookie[], local.NetworkBeforeRequestSentParameters>;
|
|
16
|
+
headers?: Overwrite<Record<string, string>, local.NetworkBeforeRequestSentParameters>;
|
|
17
|
+
method?: Overwrite<Methods, local.NetworkBeforeRequestSentParameters>;
|
|
18
|
+
url?: Overwrite<string, local.NetworkBeforeRequestSentParameters>;
|
|
19
|
+
}
|
|
20
|
+
export interface RespondWithOptions extends Omit<RequestWithOptions, 'url' | 'method'> {
|
|
21
|
+
statusCode?: Overwrite<number, local.NetworkResponseCompletedParameters>;
|
|
22
|
+
}
|
|
23
|
+
export interface MockRequestOptions {
|
|
24
|
+
requestWith?: RequestWithOptions;
|
|
93
25
|
}
|
|
94
|
-
export type
|
|
26
|
+
export type MockOptions = MockFilterOptions & MockRequestOptions;
|
|
27
|
+
export {};
|
|
95
28
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/utils/interception/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/utils/interception/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAE7C,MAAM,MAAM,iBAAiB,GAAG;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,CAAA;IAC/C,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,OAAO,CAAC,CAAA;IACjF,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,OAAO,CAAC,CAAA;IACxF,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,OAAO,CAAC,CAAA;IACzF,UAAU,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAA;IACvD,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,KAAK,OAAO,CAAC,CAAA;CACjE,CAAA;AAED,KAAK,SAAS,CAAE,CAAC,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC,CAAA;AAC3D,KAAK,OAAO,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,KAAK,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;AAE/E,MAAM,WAAW,kBAAkB;IAC/B,IAAI,CAAC,EAAE,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,kCAAkC,CAAC,CAAA;IAC/D,OAAO,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC,kCAAkC,CAAC,CAAA;IACvE,OAAO,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC,kCAAkC,CAAC,CAAA;IACrF,MAAM,CAAC,EAAE,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,kCAAkC,CAAC,CAAA;IACrE,GAAG,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,kCAAkC,CAAC,CAAA;CACpE;AAED,MAAM,WAAW,kBAAmB,SAAQ,IAAI,CAAC,kBAAkB,EAAE,KAAK,GAAG,QAAQ,CAAC;IAClF,UAAU,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,kCAAkC,CAAC,CAAA;CAC3E;AAED,MAAM,WAAW,kBAAkB;IAC/B,WAAW,CAAC,EAAE,kBAAkB,CAAA;CACnC;AAED,MAAM,MAAM,WAAW,GAAG,iBAAiB,GAAG,kBAAkB,CAAA"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { local, remote } from 'webdriver';
|
|
2
|
+
import type { RequestWithOptions, RespondWithOptions } from './types.js';
|
|
3
|
+
/**
|
|
4
|
+
* parse request or response overwrites to make it compatible with Bidis protocol
|
|
5
|
+
* @param overwrite request or response overwrite
|
|
6
|
+
* @returns object to pass to the protocol
|
|
7
|
+
*/
|
|
8
|
+
export declare function parseOverwrite(overwrite: RequestWithOptions | RespondWithOptions, request: local.NetworkBeforeRequestSentParameters | local.NetworkResponseCompletedParameters): {
|
|
9
|
+
body: remote.NetworkBytesValue | undefined;
|
|
10
|
+
headers: remote.NetworkHeader[];
|
|
11
|
+
cookies: remote.NetworkSetCookieHeader[];
|
|
12
|
+
method: string | undefined;
|
|
13
|
+
statusCode: number | undefined;
|
|
14
|
+
url: string | undefined;
|
|
15
|
+
};
|
|
16
|
+
export declare function getPatternParam(pattern: URLPattern, key: keyof Omit<remote.NetworkUrlPatternPattern, 'type'>): string | undefined;
|
|
17
|
+
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/utils/interception/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAExE;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,kBAAkB,GAAG,kBAAkB,EAAE,OAAO,EAAE,KAAK,CAAC,kCAAkC,GAAG,KAAK,CAAC,kCAAkC;;;;;;;EA6E9K;AAED,wBAAgB,eAAe,CAAE,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,IAAI,CAAC,MAAM,CAAC,wBAAwB,EAAE,MAAM,CAAC,sBAU7G"}
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* parse request or response overwrites to make it compatible with Bidis protocol
|
|
3
|
+
* @param overwrite request or response overwrite
|
|
4
|
+
* @returns object to pass to the protocol
|
|
5
|
+
*/
|
|
6
|
+
export function parseOverwrite(overwrite, request) {
|
|
7
|
+
let body = undefined;
|
|
8
|
+
if ('body' in overwrite && overwrite.body) {
|
|
9
|
+
const bodyOverwrite = typeof overwrite.body === 'function'
|
|
10
|
+
? overwrite.body(request)
|
|
11
|
+
: overwrite.body;
|
|
12
|
+
body = typeof bodyOverwrite === 'string' ?
|
|
13
|
+
/**
|
|
14
|
+
* if body is a string we can pass it as is
|
|
15
|
+
*/
|
|
16
|
+
{
|
|
17
|
+
type: 'string',
|
|
18
|
+
value: bodyOverwrite
|
|
19
|
+
}
|
|
20
|
+
:
|
|
21
|
+
/**
|
|
22
|
+
* if body is an object we need to encode it
|
|
23
|
+
*/
|
|
24
|
+
{
|
|
25
|
+
type: 'base64',
|
|
26
|
+
value: globalThis.Buffer
|
|
27
|
+
? globalThis.Buffer.from(JSON.stringify(bodyOverwrite || '')).toString('base64')
|
|
28
|
+
: btoa(JSON.stringify(bodyOverwrite))
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
let headers = [];
|
|
32
|
+
const headersOverwrite = typeof overwrite.headers === 'function'
|
|
33
|
+
? overwrite.headers(request)
|
|
34
|
+
: overwrite.headers;
|
|
35
|
+
if (headersOverwrite) {
|
|
36
|
+
headers = Object.entries(headersOverwrite).map(([name, value]) => ({
|
|
37
|
+
name,
|
|
38
|
+
value: { type: 'string', value }
|
|
39
|
+
}));
|
|
40
|
+
}
|
|
41
|
+
let cookies = [];
|
|
42
|
+
if ('cookies' in overwrite && overwrite.cookies) {
|
|
43
|
+
const cookieOverwrite = typeof overwrite.cookies === 'function'
|
|
44
|
+
? overwrite.cookies(request) || []
|
|
45
|
+
: overwrite.cookies;
|
|
46
|
+
cookies = cookieOverwrite.map((cookie) => ({
|
|
47
|
+
name: cookie.name,
|
|
48
|
+
value: {
|
|
49
|
+
type: 'string',
|
|
50
|
+
value: cookie.value
|
|
51
|
+
},
|
|
52
|
+
domain: cookie.domain,
|
|
53
|
+
path: cookie.path,
|
|
54
|
+
expires: cookie.expiry,
|
|
55
|
+
httpOnly: cookie.httpOnly,
|
|
56
|
+
secure: cookie.secure,
|
|
57
|
+
sameSite: cookie.sameSite?.toLowerCase(),
|
|
58
|
+
}));
|
|
59
|
+
}
|
|
60
|
+
let statusCode = undefined;
|
|
61
|
+
if ('statusCode' in overwrite && overwrite.statusCode) {
|
|
62
|
+
const statusCodeOverwrite = typeof overwrite.statusCode === 'function'
|
|
63
|
+
? overwrite.statusCode(request)
|
|
64
|
+
: overwrite.statusCode;
|
|
65
|
+
statusCode = statusCodeOverwrite;
|
|
66
|
+
}
|
|
67
|
+
const method = 'method' in overwrite
|
|
68
|
+
? typeof overwrite.method === 'function'
|
|
69
|
+
? overwrite.method(request)
|
|
70
|
+
: overwrite.method
|
|
71
|
+
: undefined;
|
|
72
|
+
const url = 'url' in overwrite
|
|
73
|
+
? typeof overwrite.url === 'function'
|
|
74
|
+
? overwrite.url(request)
|
|
75
|
+
: overwrite.url
|
|
76
|
+
: undefined;
|
|
77
|
+
return { body, headers, cookies, method, statusCode, url };
|
|
78
|
+
}
|
|
79
|
+
export function getPatternParam(pattern, key) {
|
|
80
|
+
if (key !== 'pathname' && pattern[key] === '*') {
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
if (key === 'port' && pattern.port === '') {
|
|
84
|
+
return pattern.protocol === 'https' ? '443' : '80';
|
|
85
|
+
}
|
|
86
|
+
return pattern[key].replaceAll('*', '\\*');
|
|
87
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refetchElement.d.ts","sourceRoot":"","sources":["../../src/utils/refetchElement.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAA8B,cAAc,CACxC,cAAc,EAAE,WAAW,CAAC,OAAO,EACnC,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"refetchElement.d.ts","sourceRoot":"","sources":["../../src/utils/refetchElement.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAA8B,cAAc,CACxC,cAAc,EAAE,WAAW,CAAC,OAAO,EACnC,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CA8B9B"}
|
|
@@ -5,14 +5,18 @@ import implicitWait from './implicitWait.js';
|
|
|
5
5
|
*/
|
|
6
6
|
export default async function refetchElement(currentElement, commandName) {
|
|
7
7
|
const selectors = [];
|
|
8
|
-
|
|
8
|
+
/**
|
|
9
|
+
* Crawl back to the browser object, and cache all selectors
|
|
10
|
+
*/
|
|
9
11
|
while (currentElement.elementId && currentElement.parent) {
|
|
10
12
|
selectors.push({ selector: currentElement.selector, index: currentElement.index || 0 });
|
|
11
13
|
currentElement = currentElement.parent;
|
|
12
14
|
}
|
|
13
15
|
selectors.reverse();
|
|
14
16
|
const length = selectors.length;
|
|
15
|
-
|
|
17
|
+
/**
|
|
18
|
+
* Beginning with the browser object, re-chain
|
|
19
|
+
*/
|
|
16
20
|
return selectors.reduce(async (elementPromise, { selector, index }, currentIndex) => {
|
|
17
21
|
const resolvedElement = await elementPromise;
|
|
18
22
|
let nextElement = index > 0 ? (await resolvedElement.$$(selector))[index] : null;
|
|
@@ -24,4 +28,3 @@ export default async function refetchElement(currentElement, commandName) {
|
|
|
24
28
|
return await implicitWait(nextElement, currentIndex + 1 < length ? '$' : commandName);
|
|
25
29
|
}, Promise.resolve(currentElement));
|
|
26
30
|
}
|
|
27
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVmZXRjaEVsZW1lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvcmVmZXRjaEVsZW1lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxZQUFZLE1BQU0sbUJBQW1CLENBQUE7QUFHNUM7OztHQUdHO0FBQ0gsTUFBTSxDQUFDLE9BQU8sQ0FBQyxLQUFLLFVBQVUsY0FBYyxDQUN4QyxjQUFtQyxFQUNuQyxXQUFtQjtJQUVuQixNQUFNLFNBQVMsR0FHVCxFQUFFLENBQUE7SUFFUiwyREFBMkQ7SUFDM0QsT0FBTyxjQUFjLENBQUMsU0FBUyxJQUFJLGNBQWMsQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUN2RCxTQUFTLENBQUMsSUFBSSxDQUFDLEVBQUUsUUFBUSxFQUFFLGNBQWMsQ0FBQyxRQUFRLEVBQUUsS0FBSyxFQUFFLGNBQWMsQ0FBQyxLQUFLLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQTtRQUN2RixjQUFjLEdBQUcsY0FBYyxDQUFDLE1BQTZCLENBQUE7SUFDakUsQ0FBQztJQUNELFNBQVMsQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUVuQixNQUFNLE1BQU0sR0FBRyxTQUFTLENBQUMsTUFBTSxDQUFBO0lBRS9CLDZDQUE2QztJQUM3QyxPQUFPLFNBQVMsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLGNBQWMsRUFBRSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsRUFBRSxZQUFZLEVBQUUsRUFBRTtRQUNoRixNQUFNLGVBQWUsR0FBRyxNQUFNLGNBQWMsQ0FBQTtRQUM1QyxJQUFJLFdBQVcsR0FBRyxLQUFLLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sZUFBZSxDQUFDLEVBQUUsQ0FBQyxRQUFrQixDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFBO1FBQzFGLFdBQVcsR0FBRyxXQUFXLElBQUksTUFBTSxlQUFlLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFBO1FBQzlEOzs7V0FHRztRQUNILE9BQU8sTUFBTSxZQUFZLENBQUMsV0FBVyxFQUFFLFlBQVksR0FBRyxDQUFDLEdBQUcsTUFBTSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxDQUFBO0lBQ3pGLENBQUMsRUFBRSxPQUFPLENBQUMsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUE7QUFDdkMsQ0FBQyJ9
|
|
@@ -268,4 +268,3 @@ export default function querySelectorAllDeep(findMany, s, r) {
|
|
|
268
268
|
}
|
|
269
269
|
return _querySelectorDeep(s, r || document);
|
|
270
270
|
}
|
|
271
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"querySelectorShadowDom.js","sourceRoot":"","sources":["../../../src/utils/thirdParty/querySelectorShadowDom.ts"],"names":[],"mappings":"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"}
|