fixed filename

clr-li · Dec 22, 2023 · 0f33d69 · 0f33d69
1 parent 6eee294
commit 0f33d69
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/.badges/file-count.svg b/.badges/file-count.svg
diff --git a/.badges/lines-of-code.svg b/.badges/lines-of-code.svg
diff --git a/server/Database.js b/server/Database.js
@@ -6,7 +6,7 @@ const sqlite3 = require('sqlite3').verbose();
 // ============================ INIT SQLite DATABASE ============================
 /** @type { import('sqlite3').Database } */
 let db;
-async function reinitializeIfNotExists(dbFile=':memory:', schemaFile='databaseSchema.sql') {
+async function reinitializeIfNotExists(dbFile=':memory:', schemaFile='./server/databaseSchema.sql') {
     const exists = dbFile != ':memory:' && fs.existsSync(dbFile);
     if (exists) console.log("Database file found: " + dbFile);
     if (db) await new Promise((resolve, reject) => {

diff --git a/server/server.js b/server/server.js
@@ -21,8 +21,8 @@ app.use(cors(corsOptions))
 app.use(express.static("public"));
 
 // ============================ DATABASE ============================
-const schemaFile = "./databaseSchema.sql"; // filepath for the database schema
-require('./Database').reinitializeIfNotExists(process.env.DB_FILE, schemaFile);
+const schemaFile = "./server/databaseSchema.sql"; // filepath for the database schema
+module.exports.initPromise = require('./Database').reinitializeIfNotExists(process.env.DB_FILE, schemaFile);
 
 // ============================ AUTHENTICATION ============================
 const { authRouter } = require('./Auth');

diff --git a/test/client.test.js b/test/client.test.js
@@ -44,7 +44,8 @@ describe('Client', () => {
   before(async () => {
     // spin up the server
     process.env.DEVELOPMENT = supportsGoogleSignIn() ? 'false' : 'true';
-    ({ listener } = require('../server/server.js'));
+    ({ listener, initPromise } = require('../server/server.js'));
+    await initPromise;
     port = listener.address().port;
 
     // spin up the browser

diff --git a/test/server.test.js b/test/server.test.js
@@ -65,7 +65,7 @@ describe('Server', () => {
 
     describe('Database', () => {
         beforeEach(async () => {
-            await reinitializeIfNotExists(TEST_DB_FILE, './databaseSchema.sql');
+            await reinitializeIfNotExists(TEST_DB_FILE, './server/databaseSchema.sql');
         });
 
         it('Should not return a value when asyncRun called', async () => {
@@ -108,7 +108,7 @@ describe('Server', () => {
 
     describe('Authentication', () => {
         beforeEach(async () => {
-            await reinitializeIfNotExists(TEST_DB_FILE, './databaseSchema.sql');
+            await reinitializeIfNotExists(TEST_DB_FILE, './server/databaseSchema.sql');
         });
 
         it('Should return 400 Invalid Input when no token is provided', (t, done) => {
@@ -195,7 +195,7 @@ describe('Server', () => {
 
     describe('Business', () => {
         beforeEach(async () => {
-            await reinitializeIfNotExists(TEST_DB_FILE, './databaseSchema.sql');
+            await reinitializeIfNotExists(TEST_DB_FILE, './server/databaseSchema.sql');
         });
 
         it('Should create a business with the correct values when createBusiness called', async (t) => {