From 4af6310a9c42fbc81ab82d6253becf1f3fdeebac Mon Sep 17 00:00:00 2001 From: Kevin J Hoerr Date: Thu, 7 Apr 2022 06:13:09 +0000 Subject: #17 Move TOKEN from EnvConfig to database --- src/routes.test.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/routes.test.ts') diff --git a/src/routes.test.ts b/src/routes.test.ts index f151d79..188cd13 100644 --- a/src/routes.test.ts +++ b/src/routes.test.ts @@ -24,7 +24,6 @@ jest.mock("./util/logger", () => ({ import loggerConfig from "./util/logger"; import dotenv from "dotenv"; -import { Db } from "mongodb"; dotenv.config(); const LOGGER = winston.createLogger(loggerConfig("TEST", "debug")); @@ -33,7 +32,7 @@ const HOST_DIR = (() => { const dir = path.join(__dirname, "..", "dist"); console.warn( - `WARNING: HOST_DIR is not set - this is used to query files in src/routes.test.ts. Using '${dir}' as default HOST_DIR.` + `HOST_DIR is not set - this is used to query files in src/routes.test.ts. Using '${dir}' as default HOST_DIR.` ); return dir; })(); @@ -41,7 +40,6 @@ const TARGET_URL = "https://localhost:3000"; const TOKEN = "THISISCORRECT"; const config: EnvConfig = { - token: TOKEN, // should be just larger than the example report used uploadLimit: Number(40000), hostDir: HOST_DIR, @@ -58,9 +56,7 @@ const config: EnvConfig = { const defaultMetadata = { logger: LOGGER, - database: {} as Db, config: config, - getToken: () => config.token, getUploadLimit: () => config.uploadLimit, getHostDir: () => config.hostDir, getPublicDir: () => config.publicDir, @@ -79,11 +75,14 @@ const defaultMetadata = { ), updateBranch: jest.fn(() => Promise.resolve(true)), createRepository: jest.fn(() => Promise.resolve(true)), + checkToken: (token: string) => Promise.resolve(token === TOKEN), + close: jest.fn(), }; const request = async (): Promise> => { const app = express(); - app.use(routes(defaultMetadata as Metadata)); + // The unknown is dbClient, since it's a private member. It's not used anyways for routes + app.use(routes(defaultMetadata as unknown as Metadata)); return _request(app); }; -- cgit