@wdio/browser-runner 9.0.1 → 9.0.4
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/setup.js
CHANGED
|
@@ -145,7 +145,10 @@ var MochaFramework = class extends HTMLElement {
|
|
|
145
145
|
const globalTeardownScripts = [];
|
|
146
146
|
const globalSetupScripts = [];
|
|
147
147
|
for (const r of __privateGet(this, _require)) {
|
|
148
|
-
const { mochaGlobalSetup, mochaGlobalTeardown } = await import(
|
|
148
|
+
const { mochaGlobalSetup, mochaGlobalTeardown } = await import(
|
|
149
|
+
/* @vite-ignore */
|
|
150
|
+
r
|
|
151
|
+
) || {};
|
|
149
152
|
if (typeof mochaGlobalSetup === "function") {
|
|
150
153
|
globalSetupScripts.push(mochaGlobalSetup);
|
|
151
154
|
}
|
|
@@ -163,7 +166,10 @@ var MochaFramework = class extends HTMLElement {
|
|
|
163
166
|
const afterTest = __privateMethod(this, _MochaFramework_instances, getHook_fn).call(this, "afterTest");
|
|
164
167
|
setupEnv(cid, window.__wdioEnv__.args, beforeTest, beforeHook, afterTest, afterHook);
|
|
165
168
|
const file = __privateGet(this, _spec);
|
|
166
|
-
await import(
|
|
169
|
+
await import(
|
|
170
|
+
/* @vite-ignore */
|
|
171
|
+
file
|
|
172
|
+
);
|
|
167
173
|
for (const setupScript of globalSetupScripts) {
|
|
168
174
|
await setupScript();
|
|
169
175
|
}
|
package/build/index.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import fs4 from "node:fs/promises";
|
|
3
3
|
import url7 from "node:url";
|
|
4
4
|
import path9 from "node:path";
|
|
5
|
-
import
|
|
5
|
+
import logger9 from "@wdio/logger";
|
|
6
6
|
import LocalRunner from "@wdio/local-runner";
|
|
7
7
|
import libCoverage2 from "istanbul-lib-coverage";
|
|
8
8
|
import libReport from "istanbul-lib-report";
|
|
@@ -12,7 +12,7 @@ import reports from "istanbul-reports";
|
|
|
12
12
|
import path5 from "node:path";
|
|
13
13
|
import { EventEmitter } from "node:events";
|
|
14
14
|
import getPort from "get-port";
|
|
15
|
-
import
|
|
15
|
+
import logger5 from "@wdio/logger";
|
|
16
16
|
import istanbulPlugin from "vite-plugin-istanbul";
|
|
17
17
|
import { deepmerge as deepmerge2 } from "deepmerge-ts";
|
|
18
18
|
import { createServer } from "vite";
|
|
@@ -376,11 +376,12 @@ function testrunner(options) {
|
|
|
376
376
|
return wdioExpectModulePath;
|
|
377
377
|
}
|
|
378
378
|
if (id === "@wdio/logger") {
|
|
379
|
-
const newId =
|
|
379
|
+
const newId = await resolveWDIOModule(id);
|
|
380
380
|
return path2.resolve(path2.dirname(newId), "browser.js");
|
|
381
381
|
}
|
|
382
382
|
if (id.startsWith("@wdio") || WDIO_PACKAGES.includes(id)) {
|
|
383
|
-
|
|
383
|
+
const resolvedId = await resolveWDIOModule(id);
|
|
384
|
+
return resolvedId;
|
|
384
385
|
}
|
|
385
386
|
if (MODULES_TO_MOCK.includes(id)) {
|
|
386
387
|
return mockModulePath;
|
|
@@ -461,6 +462,15 @@ function testrunner(options) {
|
|
|
461
462
|
}
|
|
462
463
|
}];
|
|
463
464
|
}
|
|
465
|
+
async function resolveWDIOModule(pkgName) {
|
|
466
|
+
try {
|
|
467
|
+
const pkgPath = await resolve2(pkgName, import.meta.url);
|
|
468
|
+
return url2.fileURLToPath(pkgPath);
|
|
469
|
+
} catch {
|
|
470
|
+
const pkgPath = await resolve2(pkgName, url2.pathToFileURL(path2.resolve(process.cwd())).href);
|
|
471
|
+
return url2.fileURLToPath(pkgPath);
|
|
472
|
+
}
|
|
473
|
+
}
|
|
464
474
|
|
|
465
475
|
// src/vite/plugins/mockHoisting.ts
|
|
466
476
|
import os from "node:os";
|
|
@@ -765,6 +775,7 @@ var MockHandler = class {
|
|
|
765
775
|
};
|
|
766
776
|
|
|
767
777
|
// src/vite/constants.ts
|
|
778
|
+
import logger4 from "@wdio/logger";
|
|
768
779
|
import topLevelAwait from "vite-plugin-top-level-await";
|
|
769
780
|
import { esbuildCommonjs } from "@originjs/vite-plugin-commonjs";
|
|
770
781
|
|
|
@@ -805,6 +816,7 @@ function codeFrameFix() {
|
|
|
805
816
|
}
|
|
806
817
|
|
|
807
818
|
// src/vite/constants.ts
|
|
819
|
+
var log4 = logger4("@wdio/browser-runner:vite");
|
|
808
820
|
var DEFAULT_PROTOCOL = "http";
|
|
809
821
|
var DEFAULT_HOSTNAME = "localhost";
|
|
810
822
|
var DEFAULT_HOST = `${DEFAULT_PROTOCOL}://${DEFAULT_HOSTNAME}`;
|
|
@@ -829,7 +841,7 @@ var PRESET_DEPENDENCIES = {
|
|
|
829
841
|
var DEFAULT_VITE_CONFIG = {
|
|
830
842
|
configFile: false,
|
|
831
843
|
server: { host: DEFAULT_HOSTNAME },
|
|
832
|
-
logLevel: "
|
|
844
|
+
logLevel: "info",
|
|
833
845
|
plugins: [topLevelAwait()],
|
|
834
846
|
build: {
|
|
835
847
|
sourcemap: "inline",
|
|
@@ -873,11 +885,21 @@ var DEFAULT_VITE_CONFIG = {
|
|
|
873
885
|
codeFrameFix()
|
|
874
886
|
]
|
|
875
887
|
}
|
|
888
|
+
},
|
|
889
|
+
customLogger: {
|
|
890
|
+
info: (msg) => log4.info(msg),
|
|
891
|
+
warn: (msg) => log4.warn(msg),
|
|
892
|
+
warnOnce: (msg) => log4.warn(msg),
|
|
893
|
+
error: (msg) => log4.error(msg),
|
|
894
|
+
clearScreen: () => {
|
|
895
|
+
},
|
|
896
|
+
hasErrorLogged: () => false,
|
|
897
|
+
hasWarned: false
|
|
876
898
|
}
|
|
877
899
|
};
|
|
878
900
|
|
|
879
901
|
// src/vite/server.ts
|
|
880
|
-
var
|
|
902
|
+
var log5 = logger5("@wdio/browser-runner:ViteServer");
|
|
881
903
|
var DEFAULT_CONFIG_ENV = {
|
|
882
904
|
command: "serve",
|
|
883
905
|
mode: process.env.NODE_ENV === "production" ? "production" : "development"
|
|
@@ -909,7 +931,7 @@ var ViteServer = class extends EventEmitter {
|
|
|
909
931
|
]
|
|
910
932
|
});
|
|
911
933
|
if (options.coverage && options.coverage.enabled) {
|
|
912
|
-
|
|
934
|
+
log5.info("Capturing test coverage enabled");
|
|
913
935
|
const plugin = istanbulPlugin;
|
|
914
936
|
this.#viteConfig.plugins?.push(plugin({
|
|
915
937
|
cwd: config.rootDir,
|
|
@@ -945,7 +967,7 @@ var ViteServer = class extends EventEmitter {
|
|
|
945
967
|
}
|
|
946
968
|
this.#server = await createServer(this.#viteConfig);
|
|
947
969
|
await this.#server.listen();
|
|
948
|
-
|
|
970
|
+
log5.info(`Vite server started successfully on port ${vitePort}, root directory: ${this.#viteConfig.root}`);
|
|
949
971
|
}
|
|
950
972
|
async close() {
|
|
951
973
|
await this.#server?.close();
|
|
@@ -955,9 +977,9 @@ var ViteServer = class extends EventEmitter {
|
|
|
955
977
|
// src/vite/frameworks/nuxt.ts
|
|
956
978
|
import url4 from "node:url";
|
|
957
979
|
import path6 from "node:path";
|
|
958
|
-
import
|
|
980
|
+
import logger6 from "@wdio/logger";
|
|
959
981
|
import { resolve as resolve3 } from "import-meta-resolve";
|
|
960
|
-
var
|
|
982
|
+
var log6 = logger6("@wdio/browser-runner:NuxtOptimization");
|
|
961
983
|
async function isNuxtFramework(rootDir) {
|
|
962
984
|
return (await Promise.all([
|
|
963
985
|
hasFileByExtensions(path6.join(rootDir, "nuxt.config")),
|
|
@@ -1007,7 +1029,7 @@ async function optimizeForNuxt(options, config) {
|
|
|
1007
1029
|
imports: composableImports
|
|
1008
1030
|
})]
|
|
1009
1031
|
};
|
|
1010
|
-
|
|
1032
|
+
log6.info(`Optimized Vite config for Nuxt project at ${rootDir}`);
|
|
1011
1033
|
return viteConfig;
|
|
1012
1034
|
}
|
|
1013
1035
|
|
|
@@ -1193,9 +1215,9 @@ async function updateViteConfig(options, config) {
|
|
|
1193
1215
|
// src/communicator.ts
|
|
1194
1216
|
import libSourceMap from "istanbul-lib-source-maps";
|
|
1195
1217
|
import libCoverage from "istanbul-lib-coverage";
|
|
1196
|
-
import
|
|
1218
|
+
import logger7 from "@wdio/logger";
|
|
1197
1219
|
import { MESSAGE_TYPES } from "@wdio/types";
|
|
1198
|
-
var
|
|
1220
|
+
var log7 = logger7("@wdio/browser-runner");
|
|
1199
1221
|
var ServerWorkerCommunicator = class {
|
|
1200
1222
|
#mapStore = libSourceMap.createSourceMapStore();
|
|
1201
1223
|
#config;
|
|
@@ -1247,7 +1269,7 @@ var ServerWorkerCommunicator = class {
|
|
|
1247
1269
|
if (payload.name === "workerResponse") {
|
|
1248
1270
|
const msg = this.#pendingMessages.get(payload.args.id);
|
|
1249
1271
|
if (!msg) {
|
|
1250
|
-
return
|
|
1272
|
+
return log7.error(`Couldn't find message with id ${payload.args.id} from type ${payload.args.message.type}`);
|
|
1251
1273
|
}
|
|
1252
1274
|
this.#pendingMessages.delete(payload.args.id);
|
|
1253
1275
|
return msg.client.send(WDIO_EVENT_NAME, payload.args.message);
|
|
@@ -1274,8 +1296,8 @@ var ServerWorkerCommunicator = class {
|
|
|
1274
1296
|
// src/utils.ts
|
|
1275
1297
|
import util from "node:util";
|
|
1276
1298
|
import { deepmerge as deepmerge3 } from "deepmerge-ts";
|
|
1277
|
-
import
|
|
1278
|
-
var
|
|
1299
|
+
import logger8 from "@wdio/logger";
|
|
1300
|
+
var log8 = logger8("@wdio/browser-runner");
|
|
1279
1301
|
function makeHeadless(options, caps) {
|
|
1280
1302
|
const capability = caps.alwaysMatch || caps;
|
|
1281
1303
|
if (!capability.browserName) {
|
|
@@ -1310,7 +1332,7 @@ function makeHeadless(options, caps) {
|
|
|
1310
1332
|
}
|
|
1311
1333
|
});
|
|
1312
1334
|
}
|
|
1313
|
-
|
|
1335
|
+
log8.error(`Headless mode not supported for browser "${capability.browserName}"`);
|
|
1314
1336
|
return caps;
|
|
1315
1337
|
}
|
|
1316
1338
|
function adjustWindowInWatchMode(config, caps) {
|
|
@@ -1349,7 +1371,7 @@ function getCoverageByFactor(options, summary, fileName) {
|
|
|
1349
1371
|
|
|
1350
1372
|
// src/index.ts
|
|
1351
1373
|
export * from "@vitest/spy";
|
|
1352
|
-
var
|
|
1374
|
+
var log9 = logger9("@wdio/browser-runner");
|
|
1353
1375
|
var BrowserRunner = class extends LocalRunner {
|
|
1354
1376
|
constructor(options, _config) {
|
|
1355
1377
|
super(options, _config);
|
|
@@ -1382,7 +1404,7 @@ var BrowserRunner = class extends LocalRunner {
|
|
|
1382
1404
|
* nothing to initialize when running locally
|
|
1383
1405
|
*/
|
|
1384
1406
|
async initialize() {
|
|
1385
|
-
|
|
1407
|
+
log9.info("Initiate browser environment");
|
|
1386
1408
|
if (typeof this.#coverageOptions.clean === "undefined" || this.#coverageOptions.clean) {
|
|
1387
1409
|
const reportsDirectoryExist = await fs4.access(this.#reportsDirectory).then(() => true, () => false);
|
|
1388
1410
|
if (reportsDirectoryExist) {
|
|
@@ -1392,7 +1414,7 @@ var BrowserRunner = class extends LocalRunner {
|
|
|
1392
1414
|
try {
|
|
1393
1415
|
this.#viteOptimizations = await updateViteConfig(this.#options, this.#config);
|
|
1394
1416
|
} catch (err) {
|
|
1395
|
-
|
|
1417
|
+
log9.error(`Failed to optimize Vite config: ${err.stack}`);
|
|
1396
1418
|
}
|
|
1397
1419
|
await super.initialize();
|
|
1398
1420
|
}
|
|
@@ -1451,7 +1473,7 @@ var BrowserRunner = class extends LocalRunner {
|
|
|
1451
1473
|
subdir: "html"
|
|
1452
1474
|
}));
|
|
1453
1475
|
reportBases.map((reportBase) => reportBase.execute(context));
|
|
1454
|
-
|
|
1476
|
+
log9.info(`Successfully created coverage reports for ${reporter.join(", ")}`);
|
|
1455
1477
|
const summaryFilePath = path9.join(this.#reportsDirectory, "coverage-summary.json");
|
|
1456
1478
|
const summary = JSON.parse((await fs4.readFile(summaryFilePath)).toString());
|
|
1457
1479
|
coverageIssues.push(
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/vite/constants.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/vite/constants.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAGxC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAIlD,eAAO,MAAM,gBAAgB,SAAS,CAAA;AACtC,eAAO,MAAM,gBAAgB,cAAc,CAAA;AAC3C,eAAO,MAAM,YAAY,qBAA8C,CAAA;AACvE,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAiB1F,CAAA;AAED,eAAO,MAAM,mBAAmB,EAAE,OAAO,CAAC,YAAY,CA0CrD,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testrunner.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/testrunner.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AA0ClC,wBAAgB,UAAU,CAAC,OAAO,EAAE,WAAW,CAAC,oBAAoB,GAAG,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"testrunner.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/testrunner.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AA0ClC,wBAAgB,UAAU,CAAC,OAAO,EAAE,WAAW,CAAC,oBAAoB,GAAG,MAAM,EAAE,CAgJ9E"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@wdio/browser-runner",
|
|
3
|
-
"version": "9.0.
|
|
3
|
+
"version": "9.0.4",
|
|
4
4
|
"description": "A WebdriverIO runner to run unit tests tests in the browser.",
|
|
5
5
|
"author": "Christian Bromann <mail@bromann.dev>",
|
|
6
6
|
"homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-browser-runner",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
},
|
|
11
11
|
"repository": {
|
|
12
12
|
"type": "git",
|
|
13
|
-
"url": "git://github.com/webdriverio/webdriverio.git",
|
|
13
|
+
"url": "git+https://github.com/webdriverio/webdriverio.git",
|
|
14
14
|
"directory": "packages/wdio-browser-runner"
|
|
15
15
|
},
|
|
16
16
|
"keywords": [
|
|
@@ -65,14 +65,14 @@
|
|
|
65
65
|
"@originjs/vite-plugin-commonjs": "^1.0.3",
|
|
66
66
|
"@types/istanbul-lib-source-maps": "^4.0.4",
|
|
67
67
|
"@vitest/spy": "^2.0.4",
|
|
68
|
-
"@wdio/globals": "9.0.
|
|
69
|
-
"@wdio/local-runner": "9.0.
|
|
70
|
-
"@wdio/logger": "9.0.
|
|
71
|
-
"@wdio/mocha-framework": "9.0.
|
|
72
|
-
"@wdio/protocols": "9.0.
|
|
73
|
-
"@wdio/runner": "9.0.
|
|
74
|
-
"@wdio/types": "9.0.
|
|
75
|
-
"@wdio/utils": "9.0.
|
|
68
|
+
"@wdio/globals": "9.0.4",
|
|
69
|
+
"@wdio/local-runner": "9.0.4",
|
|
70
|
+
"@wdio/logger": "9.0.4",
|
|
71
|
+
"@wdio/mocha-framework": "9.0.4",
|
|
72
|
+
"@wdio/protocols": "9.0.4",
|
|
73
|
+
"@wdio/runner": "9.0.4",
|
|
74
|
+
"@wdio/types": "9.0.4",
|
|
75
|
+
"@wdio/utils": "9.0.4",
|
|
76
76
|
"deepmerge-ts": "^7.0.3",
|
|
77
77
|
"expect": "^29.7.0",
|
|
78
78
|
"expect-webdriverio": "5.0.0-alpha.2",
|
|
@@ -90,8 +90,8 @@
|
|
|
90
90
|
"vite": "~5.4.0",
|
|
91
91
|
"vite-plugin-istanbul": "^6.0.0",
|
|
92
92
|
"vite-plugin-top-level-await": "^1.4.1",
|
|
93
|
-
"webdriver": "9.0.
|
|
94
|
-
"webdriverio": "9.0.
|
|
93
|
+
"webdriver": "9.0.4",
|
|
94
|
+
"webdriverio": "9.0.4"
|
|
95
95
|
},
|
|
96
96
|
"devDependencies": {
|
|
97
97
|
"@types/istanbul-lib-coverage": "^2.0.6",
|
|
@@ -107,5 +107,5 @@
|
|
|
107
107
|
"publishConfig": {
|
|
108
108
|
"access": "public"
|
|
109
109
|
},
|
|
110
|
-
"gitHead": "
|
|
110
|
+
"gitHead": "1f3d6f781391548e8672e768e72b3d5c499a3aa7"
|
|
111
111
|
}
|