From 8993a27ff4772ffa16b98531465af2547eb7bb8a Mon Sep 17 00:00:00 2001
From: zkldi <ktchidev@gmail.com>
Date: Sat, 31 Jul 2021 01:59:44 +0100
Subject: [PATCH] remove index html tests and update github conf

---
 server/.github/test.conf.json5   |  3 +--
 server/src/server/server.test.ts | 17 -----------------
 server/src/test-utils/resets.ts  |  6 +++---
 3 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 server/src/server/server.test.ts

diff --git a/server/.github/test.conf.json5 b/server/.github/test.conf.json5
index 5e6d9afab..9c07fc144 100644
--- a/server/.github/test.conf.json5
+++ b/server/.github/test.conf.json5
@@ -12,8 +12,7 @@
 	ARC_AUTH_TOKEN: "unused",
 	CDN_FILE_ROOT: "./local-cdn",
 	PORT: 8080,
-	TYPE: "omni", // It really doesn't matter whether we're in bokutachi or kamaitachi mode. If we had the performance we could run these in parallel?
-	CLIENT_INDEX_HTML_PATH: "./src/test-utils/mock-index.html",
+	TYPE: "omni",
 	ENABLE_SERVER_HTTPS: false,
 	RUN_OWN_CDN: true
 }
diff --git a/server/src/server/server.test.ts b/server/src/server/server.test.ts
deleted file mode 100644
index ee563c68e..000000000
--- a/server/src/server/server.test.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import t from "tap";
-import { CloseAllConnections } from "test-utils/close-connections";
-import mockApi from "test-utils/mock-api";
-
-t.test("GET /", (t) => {
-	t.test("Should return our index.html", async (t) => {
-		const res = await mockApi.get("/");
-
-		t.equal(res.text, "<div>Hello World.</div>");
-
-		t.end();
-	});
-
-	t.end();
-});
-
-t.teardown(CloseAllConnections);
diff --git a/server/src/test-utils/resets.ts b/server/src/test-utils/resets.ts
index 2121ce1fc..62cf090e2 100644
--- a/server/src/test-utils/resets.ts
+++ b/server/src/test-utils/resets.ts
@@ -7,8 +7,8 @@ import path from "path";
 import CreateLogCtx from "lib/logger/logger";
 // im installing an entire library for rm rf...
 import rimraf from "rimraf";
-import { CDN_FILE_ROOT, MONGO_CONNECTION_URL } from "lib/setup/config";
 import { SetIndexes } from "external/mongo/indexes";
+import { ServerConfig } from "lib/setup/config";
 
 const logger = CreateLogCtx(__filename);
 
@@ -79,7 +79,7 @@ export default async function ResetDBState() {
 
 export function ResetCDN() {
 	return new Promise<void>((resolve, reject) =>
-		rimraf(CDN_FILE_ROOT, (err) => {
+		rimraf(ServerConfig.CDN_FILE_ROOT, (err) => {
 			if (err) {
 				reject(err);
 			}
@@ -89,7 +89,7 @@ export function ResetCDN() {
 }
 
 export async function SetIndexesForDB() {
-	const url = `${MONGO_CONNECTION_URL}/testingdb`;
+	const url = `${ServerConfig.MONGO_CONNECTION_URL}/testingdb`;
 
 	logger.info(`Setting indexes for ${url}`);