Skip to content

Commit 81c9865

Browse files
petebacondarwinpetebacondarwin
authored
Some wrangler testing cleanups (#9995)
* remove unused snapshots * remove unused helper * use vitest helpers for stubbing process env * remove unnecessary test helpers * fix typo in wrangler types test
1 parent c842a3f commit 81c9865

File tree

5 files changed

+30
-44
lines changed

5 files changed

+30
-44
lines changed

‎packages/wrangler/e2e/__snapshots__/dev.test.ts.snap‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ exports[`basic js dev: 'wrangler dev --remote' > can modify Worker during wrangl
1616

1717
exports[`basic js dev: 'wrangler dev --remote' > can modify Worker during wrangler dev --remote 2`] = `"Updated Worker! value"`;
1818

19-
exports[`basic js dev: 'wrangler dev --remote' > can modify worker during wrangler dev --remote 1`] = `"Hello World!"`;
20-
21-
exports[`basic js dev: 'wrangler dev --remote' > can modify worker during wrangler dev --remote 2`] = `"Updated Worker! value"`;
22-
2319
exports[`basic js dev: 'wrangler dev --remote' > hotkeys can be disabled with wrangler dev --remote 1`] = `"Hello World!"`;
2420

2521
exports[`basic js dev: 'wrangler dev' > --test-scheduled works with wrangler dev > custom build 1`] = `"Ran scheduled event"`;
@@ -38,8 +34,4 @@ exports[`basic js dev: 'wrangler dev' > can modify Worker during wrangler dev 1`
3834

3935
exports[`basic js dev: 'wrangler dev' > can modify Worker during wrangler dev 2`] = `"Updated Worker! value"`;
4036

41-
exports[`basic js dev: 'wrangler dev' > can modify worker during wrangler dev 1`] = `"Hello World!"`;
42-
43-
exports[`basic js dev: 'wrangler dev' > can modify worker during wrangler dev 2`] = `"Updated Worker! value"`;
44-
4537
exports[`basic js dev: 'wrangler dev' > hotkeys can be disabled with wrangler dev 1`] = `"Hello World!"`;

‎packages/wrangler/e2e/helpers/wrangler.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,6 @@ export async function runWrangler(
3030
return runCommand(getWranglerCommand(wranglerCommand), { cwd, env, timeout });
3131
}
3232

33-
export function runWranglerLongLived(
34-
wranglerCommand: string,
35-
options: WranglerCommandOptions = {}
36-
) {
37-
return new WranglerLongLivedCommand(wranglerCommand, options);
38-
}
39-
4033
export class WranglerLongLivedCommand extends LongLivedCommand {
4134
constructor(wranglerCommand: string, options: WranglerCommandOptions = {}) {
4235
super(getWranglerCommand(wranglerCommand), getOptions(options));

‎packages/wrangler/src/__tests__/dev.test.ts‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import * as fs from "node:fs";
22
import module from "node:module";
33
import getPort from "get-port";
44
import { http, HttpResponse } from "msw";
5-
import patchConsole from "patch-console";
65
import dedent from "ts-dedent";
76
import { vi } from "vitest";
87
import { ConfigController } from "../api/startDevWorker/ConfigController";
@@ -11,7 +10,6 @@ import { getWorkerAccountAndContext } from "../dev/remote";
1110
import { COMPLIANCE_REGION_CONFIG_UNKNOWN } from "../environment-variables/misc-variables";
1211
import { FatalError } from "../errors";
1312
import { CI } from "../is-ci";
14-
import { logger } from "../logger";
1513
import { sniffUserAgent } from "../package-manager";
1614
import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
1715
import { mockConsoleMethods } from "./helpers/mock-console";
@@ -132,19 +130,14 @@ describe.sequential("wrangler dev", () => {
132130
...mswSuccessOauthHandlers,
133131
...mswSuccessUserHandlers
134132
);
135-
logger.clearHistory();
136133
});
137134

138135
runInTempDir();
139136
mockAccountId();
140137
mockApiToken();
141138
const std = mockConsoleMethods();
142139
afterEach(() => {
143-
patchConsole(() => {});
144140
msw.resetHandlers();
145-
spy.mockClear();
146-
setSpy.mockClear();
147-
logger.resetLoggerLevel();
148141
});
149142

150143
async function runWranglerUntilConfig(
@@ -156,6 +149,11 @@ describe.sequential("wrangler dev", () => {
156149
} catch (e) {
157150
console.error(e);
158151
}
152+
if (spy.mock.calls.length === 0) {
153+
throw new Error(
154+
"Config was never reached:\n" + JSON.stringify(std, null, 2)
155+
);
156+
}
159157
return { ...spy.mock.calls[0][0], input: setSpy.mock.calls[0][0] };
160158
}
161159

@@ -948,6 +946,10 @@ describe.sequential("wrangler dev", () => {
948946
});
949947

950948
describe(".env", () => {
949+
const processEnv = process.env;
950+
beforeEach(() => (process.env = { ...processEnv }));
951+
afterEach(() => (process.env = processEnv));
952+
951953
beforeEach(() => {
952954
fs.writeFileSync(".env", "CUSTOM_BUILD_VAR=default");
953955
fs.writeFileSync(".env.custom", "CUSTOM_BUILD_VAR=custom");

‎packages/wrangler/src/__tests__/helpers/run-wrangler.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,16 @@ export async function runWrangler(
99
cmd = "",
1010
env: Record<string, string | undefined> = {}
1111
) {
12-
const originalEnv = process.env;
12+
for (const [key, value] of Object.entries(env)) {
13+
vi.stubEnv(key, value);
14+
}
1315
try {
14-
process.env = { ...originalEnv, ...env };
1516
const argv = shellquote.parse(cmd);
1617
await main(argv);
1718
} catch (err) {
1819
if (err instanceof Error) {
1920
err.message = normalizeString(err.message);
2021
}
2122
throw err;
22-
} finally {
23-
process.env = originalEnv;
2423
}
2524
}

‎packages/wrangler/src/__tests__/type-generation.test.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ const bindingsConfigMock: Omit<
9595
OBJECT_VAR: {
9696
enterprise: "1701-D",
9797
activeDuty: true,
98-
captian: "Picard",
98+
captain: "Picard",
9999
}, // We can assume the objects will be stringified
100100
"some-other-var": "some-other-value",
101101
},
@@ -438,7 +438,7 @@ describe("generate types", () => {
438438
TEST_KV_NAMESPACE: KVNamespace;
439439
SOMETHING: \\"asdasdfasdf\\";
440440
ANOTHER: \\"thing\\";
441-
OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captian\\":\\"Picard\\"};
441+
OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captain\\":\\"Picard\\"};
442442
\\"some-other-var\\": \\"some-other-value\\";
443443
DURABLE_DIRECT_EXPORT: DurableObjectNamespace<import(\\"./index\\").DurableDirect>;
444444
DURABLE_RE_EXPORT: DurableObjectNamespace<import(\\"./index\\").DurableReexport>;
@@ -531,7 +531,7 @@ describe("generate types", () => {
531531
TEST_KV_NAMESPACE: KVNamespace;
532532
SOMETHING: \\"asdasdfasdf\\";
533533
ANOTHER: \\"thing\\";
534-
OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captian\\":\\"Picard\\"};
534+
OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captain\\":\\"Picard\\"};
535535
\\"some-other-var\\": \\"some-other-value\\";
536536
SECRET: string;
537537
DURABLE_DIRECT_EXPORT: DurableObjectNamespace<import(\\"./index\\").DurableDirect>;
@@ -689,7 +689,7 @@ describe("generate types", () => {
689689
TEST_KV_NAMESPACE: KVNamespace;
690690
SOMETHING: \\"asdasdfasdf\\";
691691
ANOTHER: \\"thing\\";
692-
OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captian\\":\\"Picard\\"};
692+
OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captain\\":\\"Picard\\"};
693693
\\"some-other-var\\": \\"some-other-value\\";
694694
SECRET: string;
695695
DURABLE_DIRECT_EXPORT: DurableObjectNamespace<import(\\"./index\\").DurableDirect>;
@@ -771,13 +771,13 @@ describe("generate types", () => {
771771
expect(fs.readFileSync("./worker-configuration.d.ts", "utf-8"))
772772
.toMatchInlineSnapshot(`
773773
"/* eslint-disable */
774-
// Generated by Wrangler by running \`wrangler\` (hash: fc5d598f2fb05668416eab9ae2c2898d)
774+
// Generated by Wrangler by running \`wrangler\` (hash: 9dfd5cc18984b8cc3421a9e726587833)
775775
// Runtime types generated with workerd@
776776
declare namespace Cloudflare {
777777
interface Env {
778778
SOMETHING: \\"asdasdfasdf\\";
779779
ANOTHER: \\"thing\\";
780-
OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captian\\":\\"Picard\\"};
780+
OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captain\\":\\"Picard\\"};
781781
\\"some-other-var\\": \\"some-other-value\\";
782782
}
783783
}
@@ -972,7 +972,7 @@ describe("generate types", () => {
972972
interface Env {
973973
SOMETHING: \\"asdasdfasdf\\";
974974
ANOTHER: \\"thing\\";
975-
OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captian\\":\\"Picard\\"};
975+
OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captain\\":\\"Picard\\"};
976976
\\"some-other-var\\": \\"some-other-value\\";
977977
}
978978
}
@@ -1011,7 +1011,7 @@ describe("generate types", () => {
10111011
interface Env {
10121012
SOMETHING: \\"asdasdfasdf\\";
10131013
ANOTHER: \\"thing\\";
1014-
OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captian\\":\\"Picard\\"};
1014+
OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captain\\":\\"Picard\\"};
10151015
\\"some-other-var\\": \\"some-other-value\\";
10161016
}
10171017
}
@@ -1038,11 +1038,11 @@ describe("generate types", () => {
10381038
);
10391039

10401040
const localVarsEnvContent = dedent`
1041-
# Preceding comment
1042-
SECRET_A="A from .dev.vars"
1043-
MULTI_LINE_SECRET="A: line 1
1044-
line 2"
1045-
UNQUOTED_SECRET= unquoted value
1041+
# Preceding comment
1042+
SECRET_A="A from .dev.vars"
1043+
MULTI_LINE_SECRET="A: line 1
1044+
line 2"
1045+
UNQUOTED_SECRET= unquoted value
10461046
`;
10471047
fs.writeFileSync(".dev.vars", localVarsEnvContent, "utf8");
10481048

@@ -1296,7 +1296,7 @@ describe("generate types", () => {
12961296
interface Env {
12971297
SOMETHING: \\"asdasdfasdf\\";
12981298
ANOTHER: \\"thing\\";
1299-
OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captian\\":\\"Picard\\"};
1299+
OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captain\\":\\"Picard\\"};
13001300
\\"some-other-var\\": \\"some-other-value\\";
13011301
}
13021302
}
@@ -1393,13 +1393,13 @@ describe("generate types", () => {
13931393
expect(fs.readFileSync("./cloudflare-env.d.ts", "utf-8"))
13941394
.toMatchInlineSnapshot(`
13951395
"/* eslint-disable */
1396-
// Generated by Wrangler by running \`wrangler\` (hash: fc5d598f2fb05668416eab9ae2c2898d)
1396+
// Generated by Wrangler by running \`wrangler\` (hash: 9dfd5cc18984b8cc3421a9e726587833)
13971397
// Runtime types generated with workerd@
13981398
declare namespace Cloudflare {
13991399
interface Env {
14001400
SOMETHING: \\"asdasdfasdf\\";
14011401
ANOTHER: \\"thing\\";
1402-
OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captian\\":\\"Picard\\"};
1402+
OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captain\\":\\"Picard\\"};
14031403
\\"some-other-var\\": \\"some-other-value\\";
14041404
}
14051405
}
@@ -1451,13 +1451,13 @@ describe("generate types", () => {
14511451
expect(fs.readFileSync("./my-cloudflare-env-interface.d.ts", "utf-8"))
14521452
.toMatchInlineSnapshot(`
14531453
"/* eslint-disable */
1454-
// Generated by Wrangler by running \`wrangler\` (hash: 60930eb00599b0244bd44c7fd113844b)
1454+
// Generated by Wrangler by running \`wrangler\` (hash: c4701684dd76f087c31740a06b0cbdb6)
14551455
// Runtime types generated with workerd@
14561456
declare namespace Cloudflare {
14571457
interface Env {
14581458
SOMETHING: \\"asdasdfasdf\\";
14591459
ANOTHER: \\"thing\\";
1460-
OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captian\\":\\"Picard\\"};
1460+
OBJECT_VAR: {\\"enterprise\\":\\"1701-D\\",\\"activeDuty\\":true,\\"captain\\":\\"Picard\\"};
14611461
\\"some-other-var\\": \\"some-other-value\\";
14621462
}
14631463
}

0 commit comments

Comments
 (0)