From bde44bacf1a91432bcc893fe70271f3147327d00 Mon Sep 17 00:00:00 2001
From: zkldi <ktchidev@gmail.com>
Date: Sat, 23 Oct 2021 01:33:22 +0100
Subject: [PATCH] Add failsafes

---
 server/src/lib/setup/config.ts  | 3 ++-
 server/src/test-utils/resets.ts | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/src/lib/setup/config.ts b/server/src/lib/setup/config.ts
index e312b89c3..32ae92230 100644
--- a/server/src/lib/setup/config.ts
+++ b/server/src/lib/setup/config.ts
@@ -171,5 +171,6 @@ export const Environment = {
 	port,
 	redisUrl,
 	mongoUrl,
-	cdnRoot,
+	// If node_env is test, force to ./test-cdn.
+	cdnRoot: process.env.NODE_ENV === "test" ? "./test-cdn" : cdnRoot,
 };
diff --git a/server/src/test-utils/resets.ts b/server/src/test-utils/resets.ts
index d1db07a6d..8806cc601 100644
--- a/server/src/test-utils/resets.ts
+++ b/server/src/test-utils/resets.ts
@@ -79,7 +79,7 @@ export default async function ResetDBState() {
 
 export function ResetCDN() {
 	return new Promise<void>((resolve, reject) =>
-		rimraf(ServerConfig.CDN_FILE_ROOT, (err) => {
+		rimraf(Environment.cdnRoot, (err) => {
 			if (err) {
 				reject(err);
 			}