Skip to content

Refactor logout #3277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 4, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Replace console with logger in sw register
  • Loading branch information
code-asher committed May 4, 2021
commit 10babb4a0c380095e79bca99737130b33c61eb7c
4 changes: 2 additions & 2 deletions src/browser/register.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export async function registerServiceWorker(): Promise<void> {
await navigator.serviceWorker.register(path, {
scope: options.base + "/",
})
console.log("[Service Worker] registered")
logger.info(`[Service Worker] registered`)
} catch (error) {
logError(logger, `[Service Worker] registration`, error)
}
Expand All @@ -23,5 +23,5 @@ export async function registerServiceWorker(): Promise<void> {
if (typeof navigator !== "undefined" && "serviceWorker" in navigator) {
registerServiceWorker()
} else {
console.error(`[Service Worker] navigator is undefined`)
logger.error(`[Service Worker] navigator is undefined`)
}
17 changes: 9 additions & 8 deletions test/unit/register.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ describe("register", () => {
})

beforeEach(() => {
jest.clearAllMocks()
jest.mock("@coder/logger", () => loggerModule)
})

afterEach(() => {
mockRegisterFn.mockClear()
jest.resetModules()
})

Expand All @@ -39,6 +39,7 @@ describe("register", () => {
global.navigator = (undefined as unknown) as Navigator & typeof globalThis
global.location = (undefined as unknown) as Location & typeof globalThis
})

it("test should have access to browser globals from beforeAll", () => {
expect(typeof global.window).not.toBeFalsy()
expect(typeof global.document).not.toBeFalsy()
Expand Down Expand Up @@ -74,24 +75,24 @@ describe("register", () => {
})

describe("when navigator and serviceWorker are NOT defined", () => {
let spy: jest.SpyInstance

beforeEach(() => {
spy = jest.spyOn(console, "error")
jest.clearAllMocks()
jest.mock("@coder/logger", () => loggerModule)
})

afterAll(() => {
jest.restoreAllMocks()
})

it("should log an error to the console", () => {
it("should log an error", () => {
// Load service worker like you would in the browser
require("../../src/browser/register")
expect(spy).toHaveBeenCalled()
expect(spy).toHaveBeenCalledTimes(1)
expect(spy).toHaveBeenCalledWith("[Service Worker] navigator is undefined")
expect(loggerModule.logger.error).toHaveBeenCalled()
expect(loggerModule.logger.error).toHaveBeenCalledTimes(1)
expect(loggerModule.logger.error).toHaveBeenCalledWith("[Service Worker] navigator is undefined")
})
})

describe("registerServiceWorker", () => {
let serviceWorkerPath: string
let serviceWorkerScope: string
Expand Down