Archived
1
0

fix: coveragePathIgnorePatterns to /out

We were accidentally ignoring `node/routes` because we had "out"
instead of "/out" in `coveragePathIgnorePatterns` which caused
us to not collect coverage for those files. Now we do.
This commit is contained in:
Joe Previte 2021-05-05 16:38:54 -07:00
parent 027106a5e1
commit cb5ab48d48
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
2 changed files with 60 additions and 100 deletions

View File

@ -142,7 +142,7 @@
"clover" "clover"
], ],
"coveragePathIgnorePatterns": [ "coveragePathIgnorePatterns": [
"out" "/out"
], ],
"coverageThreshold": { "coverageThreshold": {
"global": { "global": {

View File

@ -6,126 +6,86 @@ import { loggerModule } from "../utils/helpers"
jest.mock("@coder/logger", () => require("../utils/helpers").loggerModule) jest.mock("@coder/logger", () => require("../utils/helpers").loggerModule)
describe("constants", () => { describe("constants", () => {
describe("getPackageJson", () => { beforeAll(() => {
jest.clearAllMocks()
jest.resetModules()
})
describe("with package.json defined", () => {
const { getPackageJson } = require("../../src/node/constants") const { getPackageJson } = require("../../src/node/constants")
afterEach(() => { let mockPackageJson = {
jest.clearAllMocks() name: "mock-code-server",
description: "Run VS Code on a remote server.",
repository: "https://github.com/cdr/code-server",
version: "1.0.0",
commit: "f6b2be2838f4afb217c2fd8f03eafedd8d55ef9b",
}
let version = ""
let commit = ""
beforeEach(() => {
jest.mock("../../package.json", () => mockPackageJson, { virtual: true })
commit = require("../../src/node/constants").commit
version = require("../../src/node/constants").version
}) })
afterAll(() => { afterAll(() => {
jest.restoreAllMocks() jest.clearAllMocks()
jest.resetModules() jest.resetModules()
}) })
it("should log a warning if package.json not found", () => { it("should provide the commit", () => {
const expectedErrorMessage = "Cannot find module './package.json' from 'src/node/constants.ts'" expect(commit).toBe("f6b2be2838f4afb217c2fd8f03eafedd8d55ef9b")
getPackageJson("./package.json")
expect(loggerModule.logger.warn).toHaveBeenCalled()
expect(loggerModule.logger.warn).toHaveBeenCalledWith(expectedErrorMessage)
}) })
it("should find the package.json", () => { it("should return the package.json version", () => {
// the function calls require from src/node/constants expect(version).toBe(mockPackageJson.version)
// so to get the root package.json we need to use ../../
const packageJson = getPackageJson("../../package.json")
expect(Object.keys(packageJson).length).toBeGreaterThan(0)
expect(packageJson.name).toBe("code-server")
expect(packageJson.description).toBe("Run VS Code on a remote server.")
expect(packageJson.repository).toBe("https://github.com/cdr/code-server")
}) })
})
describe("version", () => {
describe("with package.json.version defined", () => {
let mockPackageJson = {
name: "mock-code-server",
version: "1.0.0",
}
let version = ""
beforeEach(() => { describe("getPackageJson", () => {
jest.mock("../../package.json", () => mockPackageJson, { virtual: true }) it("should log a warning if package.json not found", () => {
version = require("../../src/node/constants").version const expectedErrorMessage = "Cannot find module './package.json' from 'src/node/constants.ts'"
getPackageJson("./package.json")
expect(loggerModule.logger.warn).toHaveBeenCalled()
expect(loggerModule.logger.warn).toHaveBeenCalledWith(expectedErrorMessage)
}) })
afterEach(() => { it("should find the package.json", () => {
jest.resetAllMocks() // the function calls require from src/node/constants
jest.resetModules() // so to get the root package.json we need to use ../../
}) const packageJson = getPackageJson("../../package.json")
expect(Object.keys(packageJson).length).toBeGreaterThan(0)
it("should return the package.json version", () => { expect(packageJson.name).toBe("mock-code-server")
// Source: https://gist.github.com/jhorsman/62eeea161a13b80e39f5249281e17c39#gistcomment-2896416 expect(packageJson.description).toBe("Run VS Code on a remote server.")
const validSemVar = new RegExp("^(0|[1-9]d*).(0|[1-9]d*).(0|[1-9]d*)") expect(packageJson.repository).toBe("https://github.com/cdr/code-server")
const isValidSemVar = validSemVar.test(version)
expect(version).not.toBe(null)
expect(isValidSemVar).toBe(true)
expect(version).toBe("1.0.0")
})
})
describe("with package.json.version missing", () => {
let mockPackageJson = {
name: "mock-code-server",
}
let version = ""
beforeEach(() => {
jest.mock("../../package.json", () => mockPackageJson, { virtual: true })
version = require("../../src/node/constants").version
})
afterEach(() => {
jest.resetAllMocks()
jest.resetModules()
})
it("should return 'development'", () => {
expect(version).toBe("development")
}) })
}) })
}) })
describe("commit", () => {
describe("with package.json.commit defined", () => {
let mockPackageJson = {
name: "mock-code-server",
commit: "f6b2be2838f4afb217c2fd8f03eafedd8d55ef9b",
}
let commit = ""
beforeEach(() => { describe("with incomplete package.json", () => {
jest.mock("../../package.json", () => mockPackageJson, { virtual: true }) let mockPackageJson = {
commit = require("../../src/node/constants").commit name: "mock-code-server",
}) }
let version = ""
let commit = ""
afterEach(() => { beforeEach(() => {
jest.resetAllMocks() jest.mock("../../package.json", () => mockPackageJson, { virtual: true })
jest.resetModules() version = require("../../src/node/constants").version
}) commit = require("../../src/node/constants").commit
it("should return the package.json.commit", () => {
// Source: https://gist.github.com/jhorsman/62eeea161a13b80e39f5249281e17c39#gistcomment-2896416
expect(commit).toBe("f6b2be2838f4afb217c2fd8f03eafedd8d55ef9b")
})
}) })
describe("with package.json.commit missing", () => {
let mockPackageJson = {
name: "mock-code-server",
}
let commit = ""
beforeEach(() => { afterEach(() => {
jest.mock("../../package.json", () => mockPackageJson, { virtual: true }) jest.clearAllMocks()
commit = require("../../src/node/constants").commit jest.resetModules()
}) })
afterEach(() => { it("version should return 'development'", () => {
jest.resetAllMocks() expect(version).toBe("development")
jest.resetModules() })
}) it("commit should return 'development'", () => {
expect(commit).toBe("development")
it("should return 'development'", () => {
expect(commit).toBe("development")
})
}) })
}) })
}) })