move test module to mock, fix server paths amd testcase config

sdetweil · sdetweil · commit d913d842672c · 2025-01-05T10:03:27.000-06:00
diff --git a/js/app.js b/js/app.js
@@ -177,7 +177,7 @@ function App () {
 				moduleFolder = defaultModuleFolder;
 			} else {
 				// running in Jest, allow defaultModules placed under moduleDir for testing
-				if (env.modulesDir === "modules" || env.modulesDir === "tests") {
+				if (env.modulesDir === "modules" || env.modulesDir === "tests/mocks") {
 					moduleFolder = defaultModuleFolder;
 				}
 			}
diff --git a/js/server.js b/js/server.js
@@ -72,7 +72,7 @@ function Server (config) {
 			app.use(helmet(config.httpHeaders));
 			app.use("/js", express.static(__dirname));
 
-			let directories = ["/config", "/css", "/fonts", "/modules", "/vendor", "/translations", "/tests/configs", "/tests/mocks", "/tests"];
+			let directories = ["/config", "/css", "/fonts", "/modules", "/vendor", "/translations", "/tests"];
 			for (const directory of directories) {
 				app.use(directory, express.static(path.resolve(global.root_path + directory)));
 			}
diff --git a/tests/configs/modules/calendar/countCalendarEvents.js b/tests/configs/modules/calendar/countCalendarEvents.js
@@ -2,7 +2,7 @@ let config = {
 	address: "0.0.0.0",
 	ipWhitelist: [],
 	timeFormat: 12,
-	foreignModulesDir: "tests",
+	foreignModulesDir: "tests/mocks",
 	modules: [
 		{
 			module: "calendar",
diff --git a/tests/mocks/testNotification/testNotification.js b/tests/mocks/testNotification/testNotification.js

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ function App () {`
`177`	`177`	`moduleFolder = defaultModuleFolder;`
`178`	`178`	`} else {`
`179`	`179`	`// running in Jest, allow defaultModules placed under moduleDir for testing`
`180`		`- if (env.modulesDir === "modules" \|\| env.modulesDir === "tests") {`
	`180`	`+ if (env.modulesDir === "modules" \|\| env.modulesDir === "tests/mocks") {`
`181`	`181`	`moduleFolder = defaultModuleFolder;`
`182`	`182`	`}`
`183`	`183`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ function Server (config) {`
`72`	`72`	`app.use(helmet(config.httpHeaders));`
`73`	`73`	`app.use("/js", express.static(__dirname));`
`74`	`74`
`75`		`- let directories = ["/config", "/css", "/fonts", "/modules", "/vendor", "/translations", "/tests/configs", "/tests/mocks", "/tests"];`
	`75`	`+ let directories = ["/config", "/css", "/fonts", "/modules", "/vendor", "/translations", "/tests"];`
`76`	`76`	`for (const directory of directories) {`
`77`	`77`	`app.use(directory, express.static(path.resolve(global.root_path + directory)));`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ let config = {`
`2`	`2`	`address: "0.0.0.0",`
`3`	`3`	`ipWhitelist: [],`
`4`	`4`	`timeFormat: 12,`
`5`		`- foreignModulesDir: "tests",`
	`5`	`+ foreignModulesDir: "tests/mocks",`
`6`	`6`	`modules: [`
`7`	`7`	`{`
`8`	`8`	`module: "calendar",`