Skip to content

Commit ec513a4

Browse files
test: tighten up metrics module mocking
Previously there were occasionally flakes where the module appeared to be unmocked when it was still supposed to be mocked.
1 parent 33daa09 commit ec513a4

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

packages/wrangler/src/__tests__/metrics.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ import { writeWranglerConfig } from "./helpers/write-wrangler-config";
3030
import type { MockInstance } from "vitest";
3131

3232
vi.mock("../metrics/helpers");
33-
vi.unmock("../metrics/metrics-config");
3433
vi.mock("../metrics/send-event");
3534
vi.mock("../package-manager");
35+
vi.mocked(getMetricsConfig).mockReset();
3636

3737
// eslint-disable-next-line @typescript-eslint/no-namespace
3838
declare module globalThis {
@@ -44,7 +44,7 @@ describe("metrics", () => {
4444
let isCISpy: MockInstance;
4545
const std = mockConsoleMethods();
4646
const { setIsTTY } = useMockIsTTY();
47-
runInTempDir();
47+
runInTempDir({ homedir: "foo" });
4848

4949
beforeEach(async () => {
5050
isCISpy = vi.spyOn(CI, "isCI").mockReturnValue(false);

packages/wrangler/src/__tests__/vitest.setup.ts

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -162,18 +162,16 @@ vi.mock("xdg-app-paths", () => {
162162
vi.mock("../metrics/metrics-config", async (importOriginal) => {
163163
const realModule =
164164
await importOriginal<typeof import("../metrics/metrics-config")>();
165-
const fakeModule = {
166-
...realModule,
167-
getMetricsConfig: () => async () => {
168-
return {
169-
enabled: false,
170-
deviceId: "mock-device",
171-
userId: undefined,
172-
};
173-
},
174-
};
175-
return fakeModule;
165+
vi.spyOn(realModule, "getMetricsConfig").mockImplementation(() => {
166+
return {
167+
enabled: false,
168+
deviceId: "mock-device",
169+
userId: undefined,
170+
};
171+
});
172+
return realModule;
176173
});
174+
177175
vi.mock("prompts", () => {
178176
return {
179177
__esModule: true,

0 commit comments

Comments
 (0)