fix: fix db tests

Author: samuel27m

jest.config.js

@@ -10,7 +10,6 @@ module.exports = {
   collectCoverageFrom: [
       '<rootDir>/src/**/*.{ts,js}',
       '!<rootDir>/src/index.{ts,js}',
-      '!<rootDir>/src/database/*.{ts,js}',
   ],
   coverageThreshold: {
     global: {

src/database/__mocks__/index.ts

@@ -0,0 +1,25 @@
+import { DataSource } from 'typeorm';
+
+const AppDataSource = new DataSource({
+    type: 'sqlite',
+    database: ':memory:',
+    synchronize: true,
+    logging: false,
+    entities: ['src/entities/*.*'],
+    migrations: [],
+    subscribers: [],
+});
+
+async function initialiseDataSource(): Promise<void> {
+    try {
+        await AppDataSource.initialize();
+    } catch (err) {
+        console.error('Error during Data Source initialization', err);
+    }
+}
+
+async function destroyDataSource(): Promise<void> {
+    await AppDataSource.destroy();
+}
+
+export { AppDataSource, initialiseDataSource, destroyDataSource };

src/database/index.ts

@@ -1,7 +1,20 @@
+/* istanbul ignore file */
 import { DataSource } from 'typeorm';
 
-// @TODO: Use jest mocks instead of this crap
-const AppDataSource = process.env.JEST_WORKER_ID ? getTestDataSource() : getAppDataSource();
+const { DB_HOST, DB_PORT, DB_USERNAME, DB_PASSWORD, DB_DATABASE } = process.env;
+const AppDataSource = new DataSource({
+    type: 'mysql',
+    host: DB_HOST,
+    port: Number(DB_PORT),
+    username: DB_USERNAME,
+    password: DB_PASSWORD,
+    database: DB_DATABASE,
+    synchronize: true,
+    logging: false,
+    entities: ['src/entities/*.*'],
+    migrations: [],
+    subscribers: [],
+});
 
 async function initialiseDataSource(): Promise<void> {
     try {
@@ -11,33 +24,8 @@ async function initialiseDataSource(): Promise<void> {
     }
 }
 
-function getAppDataSource(): DataSource {
-    const { DB_HOST, DB_PORT, DB_USERNAME, DB_PASSWORD, DB_DATABASE } = process.env;
-    return new DataSource({
-        type: 'mysql',
-        host: DB_HOST,
-        port: Number(DB_PORT),
-        username: DB_USERNAME,
-        password: DB_PASSWORD,
-        database: DB_DATABASE,
-        synchronize: true,
-        logging: false,
-        entities: ['src/entities/*.*'],
-        migrations: [],
-        subscribers: [],
-    });
+async function destroyDataSource(): Promise<void> {
+    await AppDataSource.destroy();
 }
 
-function getTestDataSource(): DataSource {
-    return new DataSource({
-        type: 'sqlite',
-        database: ':memory:',
-        synchronize: true,
-        logging: false,
-        entities: ['src/entities/*.*'],
-        migrations: [],
-        subscribers: [],
-    });
-}
-
-export { AppDataSource, initialiseDataSource };
+export { AppDataSource, initialiseDataSource, destroyDataSource };

tests/resolvers/RecipeResolver.spec.ts

@@ -1,7 +1,9 @@
 import 'reflect-metadata';
 import { createApolloServer } from '../../src/services/ApolloServices/ApolloServerService';
+import { AppDataSource, initialiseDataSource, destroyDataSource } from '../../src/database';
 import { Recipe } from '../../src/entities/Recipe';
-import { AppDataSource, initialiseDataSource } from '../../src/database';
+
+jest.mock('../../src/database');
 
 describe('RecipeResolver', () => {
     beforeAll(async () => {
@@ -16,7 +18,7 @@ describe('RecipeResolver', () => {
     });
 
     afterAll(async () => {
-        await AppDataSource.destroy();
+        await destroyDataSource();
     });
 
     it('gets recipes', async () => {