Skip to content

Commit 250c87b

Browse files
committed
refactor: migrate test files to ES module syntax
1 parent d7e222b commit 250c87b

2 files changed

Lines changed: 50 additions & 46 deletions

File tree

test/normalize-options.test.js

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
"use strict";
1+
import { describe, it } from "node:test";
2+
import { expect } from "expect";
3+
import { klona } from "klona/full";
4+
import webpack from "webpack";
5+
import Server from "../lib/Server.js";
6+
import multiCompilerConfig from "./fixtures/multi-compiler-one-configuration/webpack.config.js";
7+
import simpleConfig from "./fixtures/simple-config/webpack.config.js";
8+
import portsMap from "./ports-map.js";
29

3-
const { describe, it } = require("node:test");
4-
const { expect } = require("expect");
5-
const { klona } = require("klona/full");
6-
const webpack = require("webpack");
7-
const Server = require("../lib/Server");
8-
const port = require("./ports-map")["normalize-option"];
10+
const port = portsMap["normalize-option"];
911

1012
describe("normalize options", () => {
1113
const cases = [
@@ -577,7 +579,7 @@ describe("normalize options", () => {
577579
let webpackConfig;
578580

579581
if (item.multiCompiler) {
580-
webpackConfig = require("./fixtures/multi-compiler-one-configuration/webpack.config");
582+
webpackConfig = multiCompilerConfig;
581583

582584
if (Array.isArray(item.webpackConfig)) {
583585
webpackConfig = item.webpackConfig.map((config, index) => ({
@@ -586,7 +588,7 @@ describe("normalize options", () => {
586588
}));
587589
}
588590
} else {
589-
webpackConfig = require("./fixtures/simple-config/webpack.config");
591+
webpackConfig = simpleConfig;
590592

591593
if (item.webpackConfig) {
592594
webpackConfig = {

test/validate-options.test.js

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
"use strict";
1+
import os from "node:os";
2+
import path from "node:path";
3+
import { after, before, describe, it } from "node:test";
4+
import { fileURLToPath } from "node:url";
5+
import connect from "connect";
6+
import { expect } from "expect";
7+
import fs from "graceful-fs";
8+
import { spyOn } from "jest-mock";
9+
import { Volume, createFsFromVolume } from "memfs";
10+
import webpack from "webpack";
11+
import Server from "../lib/Server.js";
12+
import config from "./fixtures/simple-config/webpack.config.js";
213

3-
const os = require("node:os");
4-
const path = require("node:path");
5-
const { after, before, describe, it } = require("node:test");
6-
const { expect } = require("expect");
7-
const { readFileSync } = require("graceful-fs");
8-
const { spyOn } = require("jest-mock");
9-
const { Volume, createFsFromVolume } = require("memfs");
10-
const webpack = require("webpack");
11-
const Server = require("../lib/Server");
12-
const config = require("./fixtures/simple-config/webpack.config");
14+
const __dirname = path.dirname(fileURLToPath(import.meta.url));
1315

1416
const httpsCertificateDirectory = path.join(
1517
__dirname,
@@ -272,16 +274,16 @@ const tests = {
272274
{
273275
type: "https",
274276
options: {
275-
ca: readFileSync(
277+
ca: fs.readFileSync(
276278
path.join(httpsCertificateDirectory, "ca.pem"),
277279
).toString(),
278-
pfx: readFileSync(
280+
pfx: fs.readFileSync(
279281
path.join(httpsCertificateDirectory, "server.pfx"),
280282
).toString(),
281-
key: readFileSync(
283+
key: fs.readFileSync(
282284
path.join(httpsCertificateDirectory, "server.key"),
283285
).toString(),
284-
cert: readFileSync(
286+
cert: fs.readFileSync(
285287
path.join(httpsCertificateDirectory, "server.crt"),
286288
).toString(),
287289
passphrase: "webpack-dev-server",
@@ -291,22 +293,22 @@ const tests = {
291293
type: "https",
292294
options: {
293295
ca: [
294-
readFileSync(
296+
fs.readFileSync(
295297
path.join(httpsCertificateDirectory, "ca.pem"),
296298
).toString(),
297299
],
298300
pfx: [
299-
readFileSync(
301+
fs.readFileSync(
300302
path.join(httpsCertificateDirectory, "server.pfx"),
301303
).toString(),
302304
],
303305
key: [
304-
readFileSync(
306+
fs.readFileSync(
305307
path.join(httpsCertificateDirectory, "server.key"),
306308
).toString(),
307309
],
308310
cert: [
309-
readFileSync(
311+
fs.readFileSync(
310312
path.join(httpsCertificateDirectory, "server.crt"),
311313
).toString(),
312314
],
@@ -316,10 +318,10 @@ const tests = {
316318
{
317319
type: "https",
318320
options: {
319-
ca: readFileSync(path.join(httpsCertificateDirectory, "ca.pem")),
320-
pfx: readFileSync(path.join(httpsCertificateDirectory, "server.pfx")),
321-
key: readFileSync(path.join(httpsCertificateDirectory, "server.key")),
322-
cert: readFileSync(
321+
ca: fs.readFileSync(path.join(httpsCertificateDirectory, "ca.pem")),
322+
pfx: fs.readFileSync(path.join(httpsCertificateDirectory, "server.pfx")),
323+
key: fs.readFileSync(path.join(httpsCertificateDirectory, "server.key")),
324+
cert: fs.readFileSync(
323325
path.join(httpsCertificateDirectory, "server.crt"),
324326
),
325327
passphrase: "webpack-dev-server",
@@ -328,15 +330,15 @@ const tests = {
328330
{
329331
type: "https",
330332
options: {
331-
ca: [readFileSync(path.join(httpsCertificateDirectory, "ca.pem"))],
333+
ca: [fs.readFileSync(path.join(httpsCertificateDirectory, "ca.pem"))],
332334
pfx: [
333-
readFileSync(path.join(httpsCertificateDirectory, "server.pfx")),
335+
fs.readFileSync(path.join(httpsCertificateDirectory, "server.pfx")),
334336
],
335337
key: [
336-
readFileSync(path.join(httpsCertificateDirectory, "server.key")),
338+
fs.readFileSync(path.join(httpsCertificateDirectory, "server.key")),
337339
],
338340
cert: [
339-
readFileSync(path.join(httpsCertificateDirectory, "server.crt")),
341+
fs.readFileSync(path.join(httpsCertificateDirectory, "server.crt")),
340342
],
341343
passphrase: "webpack-dev-server",
342344
},
@@ -356,10 +358,10 @@ const tests = {
356358
type: "https",
357359
options: {
358360
minVersion: "TLSv1.1",
359-
ca: readFileSync(path.join(httpsCertificateDirectory, "ca.pem")),
360-
pfx: readFileSync(path.join(httpsCertificateDirectory, "server.pfx")),
361-
key: readFileSync(path.join(httpsCertificateDirectory, "server.key")),
362-
cert: readFileSync(
361+
ca: fs.readFileSync(path.join(httpsCertificateDirectory, "ca.pem")),
362+
pfx: fs.readFileSync(path.join(httpsCertificateDirectory, "server.pfx")),
363+
key: fs.readFileSync(path.join(httpsCertificateDirectory, "server.key")),
364+
cert: fs.readFileSync(
363365
path.join(httpsCertificateDirectory, "server.crt"),
364366
),
365367
passphrase: "webpack-dev-server",
@@ -368,22 +370,22 @@ const tests = {
368370
{
369371
type: "https",
370372
options: {
371-
ca: readFileSync(path.join(httpsCertificateDirectory, "ca.pem")),
373+
ca: fs.readFileSync(path.join(httpsCertificateDirectory, "ca.pem")),
372374
pfx: [
373375
{
374-
buf: readFileSync(
376+
buf: fs.readFileSync(
375377
path.join(httpsCertificateDirectory, "server.pfx"),
376378
),
377379
},
378380
],
379381
key: [
380382
{
381-
pem: readFileSync(
383+
pem: fs.readFileSync(
382384
path.join(httpsCertificateDirectory, "server.key"),
383385
),
384386
},
385387
],
386-
cert: readFileSync(
388+
cert: fs.readFileSync(
387389
path.join(httpsCertificateDirectory, "server.crt"),
388390
),
389391
passphrase: "webpack-dev-server",
@@ -435,10 +437,10 @@ const tests = {
435437
},
436438
app: {
437439
success: [
438-
() => require("connect")(),
440+
() => connect(),
439441
async () =>
440442
new Promise((resolve) => {
441-
resolve(require("connect")());
443+
resolve(connect());
442444
}),
443445
],
444446
failure: ["test", false],

0 commit comments

Comments
 (0)