From 5456866c45ed0f5d47ad022f1449f9e1e9fc03a1 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 11 May 2023 17:14:51 +0200
Subject: [PATCH] Fix tests to use connection string instead of env

---
 .../backend-core/src/db/couch/connections.ts     | 16 ++++++++--------
 .../src/integrations/validators/postgres.spec.ts |  2 ++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/backend-core/src/db/couch/connections.ts b/packages/backend-core/src/db/couch/connections.ts
index 06c661f350..4214c7cdc6 100644
--- a/packages/backend-core/src/db/couch/connections.ts
+++ b/packages/backend-core/src/db/couch/connections.ts
@@ -4,21 +4,21 @@ export const getCouchInfo = (connection?: string) => {
   const urlInfo = getUrlInfo(connection)
   let username
   let password
-  if (env.COUCH_DB_USERNAME) {
-    // set from env
-    username = env.COUCH_DB_USERNAME
-  } else if (urlInfo.auth.username) {
+  if (urlInfo.auth?.username) {
     // set from url
     username = urlInfo.auth.username
+  } else if (env.COUCH_DB_USERNAME) {
+    // set from env
+    username = env.COUCH_DB_USERNAME
   } else if (!env.isTest()) {
     throw new Error("CouchDB username not set")
   }
-  if (env.COUCH_DB_PASSWORD) {
-    // set from env
-    password = env.COUCH_DB_PASSWORD
-  } else if (urlInfo.auth.password) {
+  if (urlInfo.auth?.password) {
     // set from url
     password = urlInfo.auth.password
+  } else if (env.COUCH_DB_PASSWORD) {
+    // set from env
+    password = env.COUCH_DB_PASSWORD
   } else if (!env.isTest()) {
     throw new Error("CouchDB password not set")
   }
diff --git a/qa-core/src/integrations/validators/postgres.spec.ts b/qa-core/src/integrations/validators/postgres.spec.ts
index 5aa3250e2a..6e1219540b 100644
--- a/qa-core/src/integrations/validators/postgres.spec.ts
+++ b/qa-core/src/integrations/validators/postgres.spec.ts
@@ -1,6 +1,8 @@
 import { GenericContainer } from "testcontainers"
 import postgres from "../../../../packages/server/src/integrations/postgres"
 
+import { generator } from "@budibase/backend-core/tests"
+
 jest.unmock("pg")
 
 describe("datasource validators", () => {