Merge branch 'dev' into release-2.6

adarsh-sgh · Nov 3, 2021 · 8c6d78e · 8c6d78e
2 parents a65c424 + e6d3396
commit 8c6d78e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/packages/lib/package-lock.json b/packages/lib/package-lock.json
diff --git a/packages/renderer/package-lock.json b/packages/renderer/package-lock.json
diff --git a/packages/server/src/utils/testing/testUtils.ts b/packages/server/src/utils/testing/testUtils.ts
@@ -23,6 +23,7 @@ import MustacheService from '../../services/MustacheService';
 import uuidgen from '../uuidgen';
 import { createCsrfToken } from '../csrf';
 import { cookieSet } from '../cookies';
+import { parseEnv } from '../../env';
 
 // Takes into account the fact that this file will be inside the /dist directory
 // when it runs.
@@ -73,20 +74,20 @@ export async function beforeAllDb(unitName: string, createDbOptions: CreateDbOpt
 	//
 	// sudo docker compose -f docker-compose.db-dev.yml up
 
-	// await initConfig(Env.Dev, {
+	// await initConfig(Env.Dev, parseEnv({
 	// 	DB_CLIENT: 'pg',
 	// 	POSTGRES_DATABASE: unitName,
 	// 	POSTGRES_USER: 'joplin',
 	// 	POSTGRES_PASSWORD: 'joplin',
 	// 	SUPPORT_EMAIL: 'testing@localhost',
-	// }, {
+	// }), {
 	// 	tempDir: tempDir,
 	// });
 
-	await initConfig(Env.Dev, {
+	await initConfig(Env.Dev, parseEnv({
 		SQLITE_DATABASE: createdDbPath_,
 		SUPPORT_EMAIL: 'testing@localhost',
-	} as any, {
+	}), {
 		tempDir: tempDir,
 	});