From 700f8ada07f9faf994432ae7e5da00644e3e6bce Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 10 May 2022 16:51:37 +0200
Subject: [PATCH] allow test environment to be loaded with mocked logger

---
 backend/src/graphql/resolver/UserResolver.test.ts |  2 +-
 backend/src/server/createServer.ts                | 14 ++++++++++----
 backend/test/helpers.ts                           |  4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index 67edceb59..40dccd3c5 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -64,7 +64,7 @@ let mutate: any, query: any, con: any
 let testEnv: any
 
 beforeAll(async () => {
-  testEnv = await testEnvironment()
+  testEnv = await testEnvironment(logger)
   mutate = testEnv.mutate
   query = testEnv.query
   con = testEnv.con
diff --git a/backend/src/server/createServer.ts b/backend/src/server/createServer.ts
index 895a16dd4..b07a00827 100644
--- a/backend/src/server/createServer.ts
+++ b/backend/src/server/createServer.ts
@@ -22,15 +22,21 @@ import schema from '@/graphql/schema'
 import { elopageWebhook } from '@/webhook/elopage'
 import { Connection } from '@dbTools/typeorm'
 
-import log4js from './logger'
+import { getLogger } from './logger'
+import { Logger } from 'log4js'
+
 // TODO implement
 // import queryComplexity, { simpleEstimator, fieldConfigEstimator } from "graphql-query-complexity";
 
 type ServerDef = { apollo: ApolloServer; app: Express; con: Connection }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const createServer = async (context: any = serverContext): Promise<ServerDef> => {
-  const logger = log4js.getLogger('backend.server.createServer')
+const serverLogger = getLogger('backend.server.createServer')
+
+const createServer = async (
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  context: any = serverContext,
+  logger: Logger = serverLogger,
+): Promise<ServerDef> => {
   logger.addContext('user', 'unknown')
   logger.debug('createServer...')
 
diff --git a/backend/test/helpers.ts b/backend/test/helpers.ts
index 51610b07e..6e1856b63 100644
--- a/backend/test/helpers.ts
+++ b/backend/test/helpers.ts
@@ -25,8 +25,8 @@ export const cleanDB = async () => {
   }
 }
 
-export const testEnvironment = async () => {
-  const server = await createServer(context)
+export const testEnvironment = async (logger?: any) => {
+  const server = await createServer(context, logger)
   const con = server.con
   const testClient = createTestClient(server.apollo)
   const mutate = testClient.mutate