Refactor: Pass db related env var to make test target

Signed-off-by: Kaung Zin Hein <[email protected]>
curveball · Feb 21, 2025 · 75a6965 · 75a6965
1 parent df47070
commit 75a6965
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 13 deletions.
diff --git a/.env.test b/.env.test
diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ docker-run:
 	docker run -it --rm --name $(DOCKER_IMAGE_NAME)-01 $(DOCKER_IMAGE_NAME)
 
 test:
-	NODE_ENV=test npx tsx --test ${TEST_FILES}
+	DB_DRIVER=sqlite DB_FILENAME=":memory:" npx tsx --test ${TEST_FILES}
 
 lint:
 	npx tsc --noemit

diff --git a/src/env.ts b/src/env.ts
@@ -12,13 +12,7 @@ if (process.env.PUBLIC_URI === undefined) {
   // that we may be missing a .env file.
   //
   // This is the only required environment variable.
-  if(process.env.NODE_ENV === 'test'){
-    dotenv.config({ path: './.env.test' });
-  }
-  else{
-    dotenv.config({path: dirname(fileURLToPath(import.meta.url)) + '/../.env'});
-  }
-
+  dotenv.config({path: dirname(fileURLToPath(import.meta.url)) + '/../.env'});
 } else {
   console.warn('/env.js was loaded twice?');
 }
diff --git a/test/pagination/services.ts b/test/pagination/services.ts
@@ -1,9 +1,6 @@
 import { strict as assert } from 'node:assert';
 import { after, before, describe, it } from 'node:test';
 
-import * as dotenv from 'dotenv';
-dotenv.config({ path: './.env.test'});
-
 import { PrincipalService, recordToModel } from '../../src/principal/service.ts';
 import db, { insertAndGetId } from '../../src/database.ts';