@wdio/utils 9.21.0 → 9.23.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/README.md +2 -2
- package/build/index.js +13 -3
- package/build/node/startWebDriver.d.ts.map +1 -1
- package/build/node.js +12 -0
- package/build/shim.d.ts.map +1 -1
- package/build/test-framework/testFnWrapper.d.ts.map +1 -1
- package/build/test-framework/testInterfaceWrapper.d.ts.map +1 -1
- package/package.json +2 -2
package/README.md
CHANGED
package/build/index.js
CHANGED
|
@@ -1100,7 +1100,9 @@ function wrapCommand(commandName, fn) {
|
|
|
1100
1100
|
async function executeAsync(fn, retries, args = [], timeout = 2e4) {
|
|
1101
1101
|
this.wdioRetries = retries.attempts;
|
|
1102
1102
|
try {
|
|
1103
|
-
const
|
|
1103
|
+
const runnableTimeout = this?._runnable?._timeout;
|
|
1104
|
+
const frameworkTimeout = runnableTimeout ?? globalThis.jasmine?.DEFAULT_TIMEOUT_INTERVAL ?? timeout;
|
|
1105
|
+
const _timeout = (frameworkTimeout ?? timeout) - TIME_BUFFER;
|
|
1104
1106
|
let done = false;
|
|
1105
1107
|
const result = await Promise.race([
|
|
1106
1108
|
fn.apply(this, args),
|
|
@@ -1172,6 +1174,7 @@ var testFrameworkFnWrapper = async function({ executeHooksWithArgs: executeHooks
|
|
|
1172
1174
|
let result;
|
|
1173
1175
|
let error;
|
|
1174
1176
|
let skip = false;
|
|
1177
|
+
let autoSkipError;
|
|
1175
1178
|
const testStart = Date.now();
|
|
1176
1179
|
try {
|
|
1177
1180
|
result = await executeAsync2.call(this, specFn, retries, specFnArgs, timeout);
|
|
@@ -1193,6 +1196,7 @@ var testFrameworkFnWrapper = async function({ executeHooksWithArgs: executeHooks
|
|
|
1193
1196
|
error = err;
|
|
1194
1197
|
} else {
|
|
1195
1198
|
skip = true;
|
|
1199
|
+
autoSkipError = _err;
|
|
1196
1200
|
}
|
|
1197
1201
|
}
|
|
1198
1202
|
const duration = Date.now() - testStart;
|
|
@@ -1212,6 +1216,9 @@ var testFrameworkFnWrapper = async function({ executeHooksWithArgs: executeHooks
|
|
|
1212
1216
|
if (error && !error.matcherName) {
|
|
1213
1217
|
throw error;
|
|
1214
1218
|
}
|
|
1219
|
+
if (skip && autoSkipError) {
|
|
1220
|
+
throw autoSkipError;
|
|
1221
|
+
}
|
|
1215
1222
|
return result;
|
|
1216
1223
|
};
|
|
1217
1224
|
var filterStackTrace = (stack) => {
|
|
@@ -1239,7 +1246,8 @@ var runHook = function(hookFn, origFn, beforeFn, beforeFnArgs, afterFn, afterFnA
|
|
|
1239
1246
|
},
|
|
1240
1247
|
cid,
|
|
1241
1248
|
repeatTest,
|
|
1242
|
-
origFn.name
|
|
1249
|
+
origFn.name,
|
|
1250
|
+
timeout
|
|
1243
1251
|
);
|
|
1244
1252
|
};
|
|
1245
1253
|
wrappedHook.toString = () => hookFn.toString();
|
|
@@ -1263,7 +1271,9 @@ var runSpec = function(specTitle, specFn, origFn, beforeFn, beforeFnArgs, afterF
|
|
|
1263
1271
|
afterFnArgs
|
|
1264
1272
|
},
|
|
1265
1273
|
cid,
|
|
1266
|
-
repeatTest
|
|
1274
|
+
repeatTest,
|
|
1275
|
+
void 0,
|
|
1276
|
+
timeout
|
|
1267
1277
|
);
|
|
1268
1278
|
};
|
|
1269
1279
|
wrappedFn.toString = () => specFn.toString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startWebDriver.d.ts","sourceRoot":"","sources":["../../src/node/startWebDriver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"startWebDriver.d.ts","sourceRoot":"","sources":["../../src/node/startWebDriver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAyB,MAAM,oBAAoB,CAAA;AAQ1D,OAAO,EAA8B,KAAK,mBAAmB,IAAI,sBAAsB,EAAE,MAAM,cAAc,CAAA;AAC7G,OAAO,EAA6B,KAAK,qBAAqB,EAAE,MAAM,aAAa,CAAA;AACnF,OAAO,EAA0C,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAC9F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAM/C,MAAM,MAAM,sBAAsB,GAAG,CACjC,OAAO,CAAC,cAAc,CAAC,GACvB,IAAI,CAAC,oBAAoB,EAAE,MAAM,GAAG,mBAAmB,GAAG,sBAAsB,CAAC,GACjF,IAAI,CAAC,qBAAqB,EAAE,WAAW,CAAC,CAC3C,CAAA;AACD,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,WAAW,CAAC;QAClB,UAAU,mBAAoB,SAAQ,sBAAsB;SAAI;QAChE,UAAU,kBAAmB,SAAQ,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC;SAAI;QAC5E,UAAU,iBAAkB,SAAQ,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC;SAAI;QAC1E,UAAU,mBAAoB,SAAQ,IAAI,CAAC,sBAAsB,EAAE,MAAM,CAAC;SAAI;KACjF;CACJ;AAMD,wBAAsB,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,YAAY,wCA8KtE"}
|
package/build/node.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// src/node/startWebDriver.ts
|
|
2
2
|
import fs3 from "node:fs";
|
|
3
|
+
import os2 from "node:os";
|
|
3
4
|
import path3 from "node:path";
|
|
4
5
|
import cp2 from "node:child_process";
|
|
5
6
|
import getPort from "get-port";
|
|
@@ -332,6 +333,17 @@ If you like to run a local browser session make sure to pick from one of the fol
|
|
|
332
333
|
prefs,
|
|
333
334
|
caps["goog:chromeOptions"] || {}
|
|
334
335
|
);
|
|
336
|
+
if (process.platform === "win32" && process.env.WDIO_WORKER_ID) {
|
|
337
|
+
const existingArgs = caps["goog:chromeOptions"]?.args || [];
|
|
338
|
+
const hasUserDataDir = existingArgs.some((arg) => typeof arg === "string" && arg.includes("user-data-dir"));
|
|
339
|
+
if (!hasUserDataDir) {
|
|
340
|
+
const userDataDir = path3.join(
|
|
341
|
+
options.outputDir || os2.tmpdir(),
|
|
342
|
+
`wdio-chrome-${process.env.WDIO_WORKER_ID}-${Date.now()}`
|
|
343
|
+
);
|
|
344
|
+
caps["goog:chromeOptions"].args = [...existingArgs, `--user-data-dir=${userDataDir}`];
|
|
345
|
+
}
|
|
346
|
+
}
|
|
335
347
|
chromedriverOptions.allowedOrigins = chromedriverOptions.allowedOrigins || ["*"];
|
|
336
348
|
chromedriverOptions.allowedIps = chromedriverOptions.allowedIps || ["0.0.0.0"];
|
|
337
349
|
const driverParams = parseParams({ port, ...chromedriverOptions });
|
package/build/shim.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shim.d.ts","sourceRoot":"","sources":["../src/shim.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAuBhE;;;GAGG;AACH,UAAU,mBAAoB,SAAQ,QAAQ,CAAC,KAAK;IAChD,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,OAAO,CAAC,UAAU,CAAA;IAC3B,SAAS,EAAE,QAAQ,CAAA;IACnB,EAAE,EAAE,QAAQ,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,CAAC,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAAA;CACnC;AAED,wBAAsB,oBAAoB,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"shim.d.ts","sourceRoot":"","sources":["../src/shim.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAuBhE;;;GAGG;AACH,UAAU,mBAAoB,SAAQ,QAAQ,CAAC,KAAK;IAChD,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,OAAO,CAAC,UAAU,CAAA;IAC3B,SAAS,EAAE,QAAQ,CAAA;IACnB,EAAE,EAAE,QAAQ,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,CAAC,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAAA;CACnC;AAED,wBAAsB,oBAAoB,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,GAAE,QAAQ,GAAG,QAAQ,EAAO,EAAE,IAAI,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC,CAuE9J;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,CAiOpG;AAED;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAC9B,IAAI,EAAE,mBAAmB,EACzB,EAAE,EAAE,QAAQ,EACZ,OAAO,EAAE,UAAU,CAAC,WAAW,EAC/B,IAAI,GAAE,OAAO,EAAO,EACpB,OAAO,GAAE,MAAc,GACxB,OAAO,CAAC,OAAO,CAAC,CA8ClB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testFnWrapper.d.ts","sourceRoot":"","sources":["../../src/test-framework/testFnWrapper.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACR,cAAc,EACd,YAAY,EACZ,eAAe,EACf,cAAc,EACjB,MAAM,YAAY,CAAA;AAEnB,OAAO,CAAC,MAAM,CAAC;IAGX,IAAI,kCAAkC,EAAE,GAAG,GAAG,SAAS,CAAA;IAEvD,IAAI,kBAAkB,EAAE,GAAG,GAAG,SAAS,CAAA;CAC1C;AAUD;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,aAAa,GACtB,MAAM,OAAO,EACb,GAAG,MAAM,CACL,MAAM,EACN,YAAY,EACZ,eAAe,CAAC,OAAO,CAAC,EACxB,cAAc,CAAC,OAAO,CAAC,EACvB,MAAM,EACN,MAAM,EACN,MAAM,CAAC,EACP,MAAM,CAAC,CACV,iBAGJ,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,sBAAsB,GAC/B,MAAM,OAAO,EACb,wCAAwC,cAAc,EACtD,MAAM,MAAM,EACZ,wBAAwB,YAAY,EACpC,4BAA4B,eAAe,CAAC,OAAO,CAAC,EACpD,0BAA0B,cAAc,CAAC,OAAO,CAAC,EACjD,KAAK,MAAM,EACX,mBAAc,EACd,WAAW,MAAM,EACjB,UAAU,MAAM,
|
|
1
|
+
{"version":3,"file":"testFnWrapper.d.ts","sourceRoot":"","sources":["../../src/test-framework/testFnWrapper.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACR,cAAc,EACd,YAAY,EACZ,eAAe,EACf,cAAc,EACjB,MAAM,YAAY,CAAA;AAEnB,OAAO,CAAC,MAAM,CAAC;IAGX,IAAI,kCAAkC,EAAE,GAAG,GAAG,SAAS,CAAA;IAEvD,IAAI,kBAAkB,EAAE,GAAG,GAAG,SAAS,CAAA;CAC1C;AAUD;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,aAAa,GACtB,MAAM,OAAO,EACb,GAAG,MAAM,CACL,MAAM,EACN,YAAY,EACZ,eAAe,CAAC,OAAO,CAAC,EACxB,cAAc,CAAC,OAAO,CAAC,EACvB,MAAM,EACN,MAAM,EACN,MAAM,CAAC,EACP,MAAM,CAAC,CACV,iBAGJ,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,sBAAsB,GAC/B,MAAM,OAAO,EACb,wCAAwC,cAAc,EACtD,MAAM,MAAM,EACZ,wBAAwB,YAAY,EACpC,4BAA4B,eAAe,CAAC,OAAO,CAAC,EACpD,0BAA0B,cAAc,CAAC,OAAO,CAAC,EACjD,KAAK,MAAM,EACX,mBAAc,EACd,WAAW,MAAM,EACjB,UAAU,MAAM,iBAmEnB,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAI,OAAO,MAAM,KAAG,MAMhD,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testInterfaceWrapper.d.ts","sourceRoot":"","sources":["../../src/test-framework/testInterfaceWrapper.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EACR,UAAU,EAIV,aAAa,EAChB,MAAM,YAAY,CAAA;AAInB;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,OAAO,GAChB,MAAM,OAAO,EACb,QAAQ,QAAQ,EAChB,QAAQ,QAAQ,EAChB,UAAU,QAAQ,GAAG,QAAQ,EAAE,EAC/B,cAAc,UAAU,CAAC,OAAO,CAAC,EACjC,SAAS,QAAQ,GAAG,QAAQ,EAAE,EAC9B,aAAa,UAAU,CAAC,OAAO,CAAC,EAChC,KAAK,MAAM,EACX,YAAY,MAAM,EAClB,SAAS,MAAM,
|
|
1
|
+
{"version":3,"file":"testInterfaceWrapper.d.ts","sourceRoot":"","sources":["../../src/test-framework/testInterfaceWrapper.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EACR,UAAU,EAIV,aAAa,EAChB,MAAM,YAAY,CAAA;AAInB;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,OAAO,GAChB,MAAM,OAAO,EACb,QAAQ,QAAQ,EAChB,QAAQ,QAAQ,EAChB,UAAU,QAAQ,GAAG,QAAQ,EAAE,EAC/B,cAAc,UAAU,CAAC,OAAO,CAAC,EACjC,SAAS,QAAQ,GAAG,QAAQ,EAAE,EAC9B,aAAa,UAAU,CAAC,OAAO,CAAC,EAChC,KAAK,MAAM,EACX,YAAY,MAAM,EAClB,SAAS,MAAM,QAwClB,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,OAAO,GAChB,MAAM,OAAO,EACb,WAAW,MAAM,EACjB,QAAQ,QAAQ,EAChB,QAAQ,QAAQ,EAChB,UAAU,QAAQ,GAAG,QAAQ,EAAE,EAC/B,cAAc,UAAU,CAAC,OAAO,CAAC,EACjC,SAAS,QAAQ,GAAG,QAAQ,EAAE,EAC9B,aAAa,UAAU,CAAC,OAAO,CAAC,EAChC,KAAK,MAAM,EACX,YAAY,MAAM,EAClB,SAAS,MAAM,QAuClB,CAAA;AAED;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,gBAAgB,GACzB,MAAM,OAAO,EACb,QAAQ,QAAQ,EAChB,QAAQ,OAAO,EACf,UAAU,QAAQ,GAAG,QAAQ,EAAE,EAC/B,cAAc,UAAU,CAAC,OAAO,CAAC,EACjC,SAAS,QAAQ,GAAG,QAAQ,EAAE,EAC9B,aAAa,UAAU,CAAC,OAAO,CAAC,EAChC,KAAK,MAAM,MAEM,GAAG,eAAe,aAAa,QAkEnD,CAAA;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,oBAAoB,GAC7B,MAAM,OAAO,EACb,QAAQ,OAAO,EACf,UAAU,QAAQ,GAAG,QAAQ,EAAE,EAC/B,cAAc,UAAU,CAAC,OAAO,CAAC,EACjC,SAAS,QAAQ,GAAG,QAAQ,EAAE,EAC9B,aAAa,UAAU,CAAC,OAAO,CAAC,EAChC,QAAQ,MAAM,EACd,KAAK,MAAM,EACX,yBAAkB,SAgBrB,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@wdio/utils",
|
|
3
|
-
"version": "9.
|
|
3
|
+
"version": "9.23.0",
|
|
4
4
|
"description": "A WDIO helper utility to provide several utility functions used across the project.",
|
|
5
5
|
"author": "Christian Bromann <mail@bromann.dev>",
|
|
6
6
|
"homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-utils",
|
|
@@ -55,5 +55,5 @@
|
|
|
55
55
|
"publishConfig": {
|
|
56
56
|
"access": "public"
|
|
57
57
|
},
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "5b35e4e2b94e3ac5247ec2bf27f2f5e41ef00372"
|
|
59
59
|
}
|