Skip to content

Commit 909d425

Browse files
committed
refactor: use loggerModule in util
1 parent 11e90b7 commit 909d425

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

test/constants.test.ts

-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ describe("constants", () => {
2222

2323
getPackageJson("./package.json")
2424

25-
// expect(spy).toHaveBeenCalled()
26-
// expect(spy).toHaveBeenCalledWith(expectedErrorMessage)
2725
expect(loggerModule.logger.warn).toHaveBeenCalled()
2826
expect(loggerModule.logger.warn).toHaveBeenCalledWith(expectedErrorMessage)
2927
})

test/util.test.ts

+8-13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
import { JSDOM } from "jsdom"
2-
// Note: we need to import logger from the root
3-
// because this is the logger used in logError in ../src/common/util
4-
import { logger } from "../node_modules/@coder/logger"
52
import {
63
arrayify,
74
generateUuid,
@@ -14,12 +11,16 @@ import {
1411
split,
1512
trimSlashes,
1613
} from "../src/common/util"
14+
import { loggerModule } from "./helpers"
1715

1816
const dom = new JSDOM()
1917
global.document = dom.window.document
2018

2119
type LocationLike = Pick<Location, "pathname" | "origin">
2220

21+
// jest.mock is hoisted above the imports so we must use `require` here.
22+
jest.mock("@coder/logger", () => require("./helpers").loggerModule)
23+
2324
describe("util", () => {
2425
describe("normalize", () => {
2526
it("should remove multiple slashes", () => {
@@ -223,12 +224,6 @@ describe("util", () => {
223224
})
224225

225226
describe("logError", () => {
226-
let spy: jest.SpyInstance
227-
228-
beforeEach(() => {
229-
spy = jest.spyOn(logger, "error")
230-
})
231-
232227
afterEach(() => {
233228
jest.clearAllMocks()
234229
})
@@ -243,15 +238,15 @@ describe("util", () => {
243238

244239
logError("ui", error)
245240

246-
expect(spy).toHaveBeenCalled()
247-
expect(spy).toHaveBeenCalledWith(`ui: ${error.message} ${error.stack}`)
241+
expect(loggerModule.logger.error).toHaveBeenCalled()
242+
expect(loggerModule.logger.error).toHaveBeenCalledWith(`ui: ${error.message} ${error.stack}`)
248243
})
249244

250245
it("should log an error, even if not an instance of error", () => {
251246
logError("api", "oh no")
252247

253-
expect(spy).toHaveBeenCalled()
254-
expect(spy).toHaveBeenCalledWith("api: oh no")
248+
expect(loggerModule.logger.error).toHaveBeenCalled()
249+
expect(loggerModule.logger.error).toHaveBeenCalledWith("api: oh no")
255250
})
256251
})
257252
})

0 commit comments

Comments
 (0)