From 233c85f7a3025f87e57497218b7e80682d0c96f9 Mon Sep 17 00:00:00 2001 From: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Date: Thu, 8 Sep 2022 08:02:53 +1000 Subject: [PATCH] [EC-515] Re-enable node consoleLog.service test (#3448) --- .../spec/services/consoleLog.service.spec.ts | 27 ++----------------- libs/common/spec/shared/interceptConsole.ts | 25 +++++++++++++++++ ...ts.disabled => consoleLog.service.spec.ts} | 7 ++--- 3 files changed, 29 insertions(+), 30 deletions(-) create mode 100644 libs/common/spec/shared/interceptConsole.ts rename libs/node/spec/cli/{consoleLog.service.spec.ts.disabled => consoleLog.service.spec.ts} (89%) diff --git a/libs/common/spec/services/consoleLog.service.spec.ts b/libs/common/spec/services/consoleLog.service.spec.ts index 5f8e9ead01..3c961487f3 100644 --- a/libs/common/spec/services/consoleLog.service.spec.ts +++ b/libs/common/spec/services/consoleLog.service.spec.ts @@ -1,32 +1,9 @@ import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; -const originalConsole = console; +import { interceptConsole, restoreConsole } from "../shared/interceptConsole"; + let caughtMessage: any; -declare let console: any; - -export function interceptConsole(interceptions: any): object { - console = { - log: function () { - // eslint-disable-next-line - interceptions.log = arguments; - }, - warn: function () { - // eslint-disable-next-line - interceptions.warn = arguments; - }, - error: function () { - // eslint-disable-next-line - interceptions.error = arguments; - }, - }; - return interceptions; -} - -export function restoreConsole() { - console = originalConsole; -} - describe("ConsoleLogService", () => { let logService: ConsoleLogService; beforeEach(() => { diff --git a/libs/common/spec/shared/interceptConsole.ts b/libs/common/spec/shared/interceptConsole.ts new file mode 100644 index 0000000000..01c4063e7a --- /dev/null +++ b/libs/common/spec/shared/interceptConsole.ts @@ -0,0 +1,25 @@ +const originalConsole = console; + +declare let console: any; + +export function interceptConsole(interceptions: any): object { + console = { + log: function () { + // eslint-disable-next-line + interceptions.log = arguments; + }, + warn: function () { + // eslint-disable-next-line + interceptions.warn = arguments; + }, + error: function () { + // eslint-disable-next-line + interceptions.error = arguments; + }, + }; + return interceptions; +} + +export function restoreConsole() { + console = originalConsole; +} diff --git a/libs/node/spec/cli/consoleLog.service.spec.ts.disabled b/libs/node/spec/cli/consoleLog.service.spec.ts similarity index 89% rename from libs/node/spec/cli/consoleLog.service.spec.ts.disabled rename to libs/node/spec/cli/consoleLog.service.spec.ts index eefc3f4c66..656a74ca55 100644 --- a/libs/node/spec/cli/consoleLog.service.spec.ts.disabled +++ b/libs/node/spec/cli/consoleLog.service.spec.ts @@ -1,10 +1,7 @@ -import { - interceptConsole, - restoreConsole, -} from "@bitwarden/common/../spec/services/consolelog.service.spec"; - import { ConsoleLogService } from "@bitwarden/node/cli/services/consoleLog.service"; +import { interceptConsole, restoreConsole } from "../../../common/spec/shared/interceptConsole"; + let caughtMessage: any = {}; describe("CLI Console log service", () => {