Skip to content

Commit 596094e

Browse files
committed
fixup! simplify the code
1 parent 2da196c commit 596094e

File tree

3 files changed

+22
-42
lines changed

3 files changed

+22
-42
lines changed

packages/wrangler/e2e/unenv-preset/helper.ts

Lines changed: 0 additions & 20 deletions
This file was deleted.

packages/wrangler/e2e/unenv-preset/local.test.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
* Test building and serving locally a worker in nodejs_compat mode.
33
*/
44

5-
import dedent from "ts-dedent";
5+
import path from "node:path";
66
import { fetch } from "undici";
77
import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
8+
import { formatCompatibilityDate } from "../../src/utils/compatibility-date";
89
import { WranglerE2ETestHelper } from "../helpers/e2e-wrangler-test";
910
import { generateResourceName } from "../helpers/generate-resource-name";
10-
import { getYMDDate, workerScript } from "./helper";
1111
import { TESTS } from "./worker/index";
1212
import type { WranglerLongLivedCommand } from "../helpers/wrangler";
1313

@@ -18,15 +18,15 @@ describe(`@cloudflare/unenv-preset local tests`, () => {
1818
beforeAll(async () => {
1919
const helper = new WranglerE2ETestHelper();
2020
await helper.seed({
21-
"wrangler.jsonc": dedent`{
22-
"name": "${generateResourceName()}",
23-
"main": "${workerScript}",
24-
"compatibility_date": "${getYMDDate()}",
25-
"compatibility_flags": ["nodejs_compat"],
26-
"vars": {
27-
"DEBUG": "example"
28-
}
29-
}`,
21+
"wrangler.jsonc": JSON.stringify({
22+
name: generateResourceName(),
23+
main: path.join(__dirname, "/worker/index.ts"),
24+
compatibility_date: formatCompatibilityDate(new Date()),
25+
compatibility_flags: ["nodejs_compat"],
26+
vars: {
27+
DEBUG: "example",
28+
},
29+
}),
3030
});
3131

3232
wrangler = helper.runLongLived(`wrangler dev`, {

packages/wrangler/e2e/unenv-preset/remote.test.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
*/
55

66
import assert from "node:assert";
7-
import dedent from "ts-dedent";
7+
import path from "node:path";
88
import { fetch } from "undici";
99
import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
10+
import { formatCompatibilityDate } from "../../src/utils/compatibility-date";
1011
import { CLOUDFLARE_ACCOUNT_ID } from "../helpers/account-id";
1112
import { WranglerE2ETestHelper } from "../helpers/e2e-wrangler-test";
1213
import { generateResourceName } from "../helpers/generate-resource-name";
1314
import { retry } from "../helpers/retry";
14-
import { getYMDDate, workerScript } from "./helper";
1515
import { TESTS } from "./worker/index";
1616

1717
describe.skipIf(!CLOUDFLARE_ACCOUNT_ID)(
@@ -23,15 +23,15 @@ describe.skipIf(!CLOUDFLARE_ACCOUNT_ID)(
2323
beforeAll(async () => {
2424
helper = new WranglerE2ETestHelper();
2525
await helper.seed({
26-
"wrangler.jsonc": dedent`{
27-
"name": "${generateResourceName()}",
28-
"main": "${workerScript}",
29-
"compatibility_date": "${getYMDDate()}",
30-
"compatibility_flags": ["nodejs_compat"],
31-
"vars": {
32-
"DEBUG": "example"
33-
}
34-
}`,
26+
"wrangler.jsonc": JSON.stringify({
27+
name: generateResourceName(),
28+
main: path.join(__dirname, "/worker/index.ts"),
29+
compatibility_date: formatCompatibilityDate(new Date()),
30+
compatibility_flags: ["nodejs_compat"],
31+
vars: {
32+
DEBUG: "example",
33+
},
34+
}),
3535
});
3636

3737
const { stdout } = await helper.run(`wrangler deploy`);

0 commit comments

Comments
 (0)