@wdio/runner 8.1.2 → 8.2.0
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/browser.d.ts.map +1 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +12 -11
- package/build/utils.d.ts +2 -3
- package/build/utils.d.ts.map +1 -1
- package/build/utils.js +2 -2
- package/package.json +7 -7
package/build/browser.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAW,OAAO,EAAY,MAAM,aAAa,CAAA;AAE3E,OAAO,KAAK,YAAY,MAAM,eAAe,CAAA;AAC7C,OAAO,KAAK,EAAE,aAAa,EAA6C,MAAM,YAAY,CAAA;AAK1F,KAAK,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC,CAAC,GAAG;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,CAAA;AAOpG,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,cAAc,EAAE,cAAc,EAAE,CAAA;QAChC,cAAc,EAAE,GAAG,EAAE,CAAA;QACrB,gBAAgB,EAAE,MAAM,CAAA;KAC3B;CACJ;AAID,MAAM,CAAC,OAAO,OAAO,gBAAiB,YAAW,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC;;IAIpE,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;gBAJT,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,CAAC,UAAU,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,EACpD,MAAM,EAAE,MAAM,EAAE,EAChB,aAAa,EAAE,YAAY,CAAC,gBAAgB,EAC5C,SAAS,EAAE,YAAY;IAMnC;;OAEG;IACH,QAAQ;IAIR,IAAI;IAIE,GAAG;IA0IT,MAAM,CAAC,IAAI,CAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,gBAAgB,EAAE,QAAQ,EAAE,YAAY;CAItH"}
|
package/build/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAc1C,OAAO,KAAK,EACoD,SAAS,EAGxE,MAAM,YAAY,CAAA;AAInB,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,YAAY;;IAC5C,OAAO,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAc1C,OAAO,KAAK,EACoD,SAAS,EAGxE,MAAM,YAAY,CAAA;AAInB,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,YAAY;;IAC5C,OAAO,CAAC,QAAQ,CAAC,CAAsD;IACvE,OAAO,CAAC,aAAa,CAAC,CAAc;IACpC,OAAO,CAAC,gBAAgB,CAAQ;IAChC,OAAO,CAAC,cAAc,CAAQ;IAC9B,OAAO,CAAC,sBAAsB,CAAI;IAElC,OAAO,CAAC,SAAS,CAAC,CAAc;IAChC,OAAO,CAAC,UAAU,CAAC,CAAe;IAClC,OAAO,CAAC,OAAO,CAAC,CAAoB;IACpC,OAAO,CAAC,IAAI,CAAC,CAAQ;IACrB,OAAO,CAAC,MAAM,CAAC,CAAU;IACzB,OAAO,CAAC,KAAK,CAAC,CAA+B;IAE7C;;;;;;;;;OASG;IACG,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,SAAS;IAgLpE;;;;;;OAMG;YACW,YAAY;IAkC1B;;;;;OAKG;YACW,aAAa;IAkD3B;;OAEG;YACW,gBAAgB;IA8D9B;;OAEG;YACW,SAAS;IAmCvB;;;OAGG;IACG,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG;CAuEjC;AAED,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,eAAe,CAAA;AACvD,cAAc,YAAY,CAAA"}
|
package/build/index.js
CHANGED
|
@@ -106,7 +106,7 @@ export default class Runner extends EventEmitter {
|
|
|
106
106
|
isMultiremote,
|
|
107
107
|
instanceOptions: isMultiremote
|
|
108
108
|
? multiRemoteBrowser.instances.reduce((prev, browserName) => {
|
|
109
|
-
prev[multiRemoteBrowser
|
|
109
|
+
prev[multiRemoteBrowser.getInstance(browserName).sessionId] = multiRemoteBrowser.getInstance(browserName).options;
|
|
110
110
|
return prev;
|
|
111
111
|
}, {})
|
|
112
112
|
: {
|
|
@@ -115,8 +115,8 @@ export default class Runner extends EventEmitter {
|
|
|
115
115
|
sessionId: browser.sessionId,
|
|
116
116
|
capabilities: isMultiremote
|
|
117
117
|
? multiRemoteBrowser.instances.reduce((caps, browserName) => {
|
|
118
|
-
caps[browserName] = multiRemoteBrowser
|
|
119
|
-
caps[browserName].sessionId = multiRemoteBrowser
|
|
118
|
+
caps[browserName] = multiRemoteBrowser.getInstance(browserName).capabilities;
|
|
119
|
+
caps[browserName].sessionId = multiRemoteBrowser.getInstance(browserName).sessionId;
|
|
120
120
|
return caps;
|
|
121
121
|
}, {})
|
|
122
122
|
: { ...browser.capabilities, sessionId: browser.sessionId },
|
|
@@ -271,7 +271,7 @@ export default class Runner extends EventEmitter {
|
|
|
271
271
|
/**
|
|
272
272
|
* driver supports it
|
|
273
273
|
*/
|
|
274
|
-
typeof this._browser
|
|
274
|
+
typeof this._browser?.getLogs === 'undefined') {
|
|
275
275
|
return;
|
|
276
276
|
}
|
|
277
277
|
let logTypes;
|
|
@@ -346,16 +346,17 @@ export default class Runner extends EventEmitter {
|
|
|
346
346
|
* make sure instance(s) exist and have `sessionId`
|
|
347
347
|
*/
|
|
348
348
|
const multiremoteBrowser = this._browser;
|
|
349
|
+
const browser = this._browser;
|
|
349
350
|
const hasSessionId = Boolean(this._browser) && (this._isMultiremote
|
|
350
351
|
/**
|
|
351
352
|
* every multiremote instance should exist and should have `sessionId`
|
|
352
353
|
*/
|
|
353
|
-
? !multiremoteBrowser.instances.some((browserName) => (multiremoteBrowser
|
|
354
|
-
!multiremoteBrowser
|
|
354
|
+
? !multiremoteBrowser.instances.some((browserName) => (multiremoteBrowser.getInstance(browserName) &&
|
|
355
|
+
!multiremoteBrowser.getInstance(browserName).sessionId))
|
|
355
356
|
/**
|
|
356
357
|
* browser object should have `sessionId` in regular mode
|
|
357
358
|
*/
|
|
358
|
-
:
|
|
359
|
+
: browser.sessionId);
|
|
359
360
|
/**
|
|
360
361
|
* in watch mode we create a new child process to kill the
|
|
361
362
|
* session, see packages/wdio-local-runner/src/index.ts,
|
|
@@ -380,7 +381,7 @@ export default class Runner extends EventEmitter {
|
|
|
380
381
|
const capabilities = this._browser?.capabilities || {};
|
|
381
382
|
if (this._isMultiremote) {
|
|
382
383
|
multiremoteBrowser.instances.forEach((browserName) => {
|
|
383
|
-
capabilities[browserName] = multiremoteBrowser
|
|
384
|
+
capabilities[browserName] = multiremoteBrowser.getInstance(browserName).capabilities;
|
|
384
385
|
});
|
|
385
386
|
}
|
|
386
387
|
await this._browser?.deleteSession();
|
|
@@ -395,11 +396,11 @@ export default class Runner extends EventEmitter {
|
|
|
395
396
|
if (this._isMultiremote) {
|
|
396
397
|
multiremoteBrowser.instances.forEach((browserName) => {
|
|
397
398
|
// @ts-ignore sessionId is usually required
|
|
398
|
-
delete multiremoteBrowser
|
|
399
|
+
delete multiremoteBrowser.getInstance(browserName).sessionId;
|
|
399
400
|
});
|
|
400
401
|
}
|
|
401
|
-
else if (
|
|
402
|
-
|
|
402
|
+
else if (browser) {
|
|
403
|
+
browser.sessionId = undefined;
|
|
403
404
|
}
|
|
404
405
|
const afterSessionArgs = [this._config, capabilities, this._specs];
|
|
405
406
|
await executeHooksWithArgs('afterSession', this._config.afterSession, afterSessionArgs);
|
package/build/utils.d.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import type { Options, Capabilities } from '@wdio/types';
|
|
2
|
-
import type { Browser, MultiRemoteBrowser } from 'webdriverio';
|
|
3
2
|
export interface ConfigWithSessionId extends Omit<Options.Testrunner, 'capabilities'> {
|
|
4
3
|
sessionId?: string;
|
|
5
4
|
capabilities: Capabilities.RemoteCapability;
|
|
@@ -17,7 +16,7 @@ export declare function sanitizeCaps(caps: Capabilities.RemoteCapability, filter
|
|
|
17
16
|
* @param {boolean} isMultiremote isMultiremote
|
|
18
17
|
* @return {Promise} resolves with browser object
|
|
19
18
|
*/
|
|
20
|
-
export declare function initialiseInstance(config: ConfigWithSessionId, capabilities: Capabilities.RemoteCapability, isMultiremote?: boolean): Promise<Browser
|
|
19
|
+
export declare function initialiseInstance(config: ConfigWithSessionId, capabilities: Capabilities.RemoteCapability, isMultiremote?: boolean): Promise<WebdriverIO.Browser | WebdriverIO.MultiRemoteBrowser>;
|
|
21
20
|
/**
|
|
22
21
|
* Filter logTypes based on filter
|
|
23
22
|
* @param {string[]} excludeDriverLogs logTypes filter
|
|
@@ -40,6 +39,6 @@ type BrowserData = {
|
|
|
40
39
|
* @param {boolean} isMultiremote isMultiremote
|
|
41
40
|
* @return {object}
|
|
42
41
|
*/
|
|
43
|
-
export declare function getInstancesData(browser: Browser
|
|
42
|
+
export declare function getInstancesData(browser: WebdriverIO.Browser | WebdriverIO.MultiRemoteBrowser, isMultiremote: boolean): Record<string, Partial<BrowserData>> | undefined;
|
|
44
43
|
export {};
|
|
45
44
|
//# sourceMappingURL=utils.d.ts.map
|
package/build/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAIxD,MAAM,WAAW,mBAAoB,SAAQ,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC;IACjF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC,gBAAgB,CAAA;CAC9C;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CACxB,IAAI,EAAE,YAAY,CAAC,gBAAgB,EACnC,SAAS,CAAC,EAAE,OAAO,GACpB,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAoBjD;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACpC,MAAM,EAAE,mBAAmB,EAC3B,YAAY,EAAE,YAAY,CAAC,gBAAgB,EAC3C,aAAa,CAAC,EAAE,OAAO,GACxB,OAAO,CAAC,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,kBAAkB,CAAC,CAgD/D;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC1B,iBAAiB,EAAE,MAAM,EAAE,EAC3B,cAAc,EAAE,MAAM,EAAE,YAa3B;AAED,KAAK,WAAW,GAAG;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,OAAO,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACtC,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC5B,OAAO,EAAE,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,kBAAkB,EAC7D,aAAa,EAAE,OAAO,oDAgBzB"}
|
package/build/utils.js
CHANGED
|
@@ -102,8 +102,8 @@ export function getInstancesData(browser, isMultiremote) {
|
|
|
102
102
|
const multiRemoteBrowser = browser;
|
|
103
103
|
const instances = {};
|
|
104
104
|
multiRemoteBrowser.instances.forEach((browserName) => {
|
|
105
|
-
const { protocol, hostname, port, path, queryParams } = multiRemoteBrowser
|
|
106
|
-
const { isW3C, sessionId } = multiRemoteBrowser
|
|
105
|
+
const { protocol, hostname, port, path, queryParams } = multiRemoteBrowser.getInstance(browserName).options;
|
|
106
|
+
const { isW3C, sessionId } = multiRemoteBrowser.getInstance(browserName);
|
|
107
107
|
instances[browserName] = { sessionId, isW3C, protocol, hostname, port, path, queryParams };
|
|
108
108
|
});
|
|
109
109
|
return instances;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@wdio/runner",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.2.0",
|
|
4
4
|
"description": "A WebdriverIO service that runs tests in arbitrary environments",
|
|
5
5
|
"author": "Christian Bromann <mail@bromann.dev>",
|
|
6
6
|
"homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-runner",
|
|
@@ -27,19 +27,19 @@
|
|
|
27
27
|
"typeScriptVersion": "3.8.3",
|
|
28
28
|
"dependencies": {
|
|
29
29
|
"@types/node": "^18.0.0",
|
|
30
|
-
"@wdio/config": "8.
|
|
31
|
-
"@wdio/globals": "8.
|
|
30
|
+
"@wdio/config": "8.2.0",
|
|
31
|
+
"@wdio/globals": "8.2.0",
|
|
32
32
|
"@wdio/logger": "8.1.0",
|
|
33
33
|
"@wdio/types": "8.1.2",
|
|
34
|
-
"@wdio/utils": "8.
|
|
34
|
+
"@wdio/utils": "8.2.0",
|
|
35
35
|
"deepmerge-ts": "^4.2.2",
|
|
36
36
|
"expect-webdriverio": "^4.0.1",
|
|
37
37
|
"gaze": "^1.1.2",
|
|
38
|
-
"webdriver": "8.
|
|
39
|
-
"webdriverio": "8.
|
|
38
|
+
"webdriver": "8.2.0",
|
|
39
|
+
"webdriverio": "8.2.0"
|
|
40
40
|
},
|
|
41
41
|
"publishConfig": {
|
|
42
42
|
"access": "public"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "3620e90e47b6d3e62832f5de24f43cee6b31e972"
|
|
45
45
|
}
|