From a9aa409d7c976c8b5fd8ec40c5f205f3b3d889b4 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Fri, 22 Mar 2024 15:01:40 +0000
Subject: [PATCH] Fix up tests.

---
 packages/server/jest.config.ts                   |  6 ------
 packages/server/package.json                     |  1 -
 .../api/routes/tests/queries/generic-sql.spec.ts |  2 --
 packages/server/src/api/routes/tests/row.spec.ts |  1 -
 .../server/src/api/routes/tests/viewV2.spec.ts   |  1 -
 .../server/src/integration-test/postgres.spec.ts |  1 -
 .../server/src/integrations/tests/utils/index.ts |  2 --
 .../server/src/sdk/users/tests/utils.spec.ts     | 16 ++++++++++++----
 8 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/packages/server/jest.config.ts b/packages/server/jest.config.ts
index f3f8ebce02..db0625241d 100644
--- a/packages/server/jest.config.ts
+++ b/packages/server/jest.config.ts
@@ -42,12 +42,6 @@ if (fs.existsSync("../pro/src")) {
 
 const config: Config.InitialOptions = {
   projects: [
-    {
-      ...baseConfig,
-      displayName: "sequential test",
-      testMatch: ["<rootDir>/**/*.seq.spec.[jt]s"],
-      runner: "jest-serial-runner",
-    },
     {
       ...baseConfig,
       testMatch: ["<rootDir>/**/!(*.seq).spec.[jt]s"],
diff --git a/packages/server/package.json b/packages/server/package.json
index 182b29bb61..27f34e3607 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -143,7 +143,6 @@
     "jest": "29.7.0",
     "jest-openapi": "0.14.2",
     "jest-runner": "29.7.0",
-    "jest-serial-runner": "1.2.1",
     "nock": "^13.5.4",
     "nodemon": "2.0.15",
     "openapi-typescript": "5.2.0",
diff --git a/packages/server/src/api/routes/tests/queries/generic-sql.spec.ts b/packages/server/src/api/routes/tests/queries/generic-sql.spec.ts
index 3ce96bd7d7..060699450c 100644
--- a/packages/server/src/api/routes/tests/queries/generic-sql.spec.ts
+++ b/packages/server/src/api/routes/tests/queries/generic-sql.spec.ts
@@ -13,8 +13,6 @@ import mssql from "mssql"
 import { Expectations } from "src/tests/utilities/api/base"
 import { events } from "@budibase/backend-core"
 
-jest.unmock("pg")
-
 const createTableSQL: Record<string, string> = {
   [SourceName.POSTGRES]: `
     CREATE TABLE test_table (
diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts
index f638f2c4bf..7f8a28ad99 100644
--- a/packages/server/src/api/routes/tests/row.spec.ts
+++ b/packages/server/src/api/routes/tests/row.spec.ts
@@ -30,7 +30,6 @@ const timestamp = new Date("2023-01-26T11:48:57.597Z").toISOString()
 tk.freeze(timestamp)
 
 jest.unmock("mssql")
-jest.unmock("pg")
 
 describe.each([
   ["internal", undefined],
diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts
index f9d213a26b..b99edc2264 100644
--- a/packages/server/src/api/routes/tests/viewV2.spec.ts
+++ b/packages/server/src/api/routes/tests/viewV2.spec.ts
@@ -26,7 +26,6 @@ import { quotas } from "@budibase/pro"
 import { roles } from "@budibase/backend-core"
 
 jest.unmock("mssql")
-jest.unmock("pg")
 
 describe.each([
   ["internal", undefined],
diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts
index 107c4ade1e..bb6882e0e1 100644
--- a/packages/server/src/integration-test/postgres.spec.ts
+++ b/packages/server/src/integration-test/postgres.spec.ts
@@ -23,7 +23,6 @@ fetch.mockSearch()
 
 const config = setup.getConfig()!
 
-jest.unmock("pg")
 jest.mock("../websockets")
 
 describe("postgres integrations", () => {
diff --git a/packages/server/src/integrations/tests/utils/index.ts b/packages/server/src/integrations/tests/utils/index.ts
index b2be3df4e0..7faa84099b 100644
--- a/packages/server/src/integrations/tests/utils/index.ts
+++ b/packages/server/src/integrations/tests/utils/index.ts
@@ -1,5 +1,3 @@
-jest.unmock("pg")
-
 import { Datasource } from "@budibase/types"
 import * as postgres from "./postgres"
 import * as mongodb from "./mongodb"
diff --git a/packages/server/src/sdk/users/tests/utils.spec.ts b/packages/server/src/sdk/users/tests/utils.spec.ts
index 6f1c5afd3d..0aa112094d 100644
--- a/packages/server/src/sdk/users/tests/utils.spec.ts
+++ b/packages/server/src/sdk/users/tests/utils.spec.ts
@@ -35,11 +35,20 @@ describe("syncGlobalUsers", () => {
       builder: { global: true },
     })
     await config.doInContext(config.appId, async () => {
-      expect(await rawUserMetadata()).toHaveLength(1)
+      let metadata = await rawUserMetadata()
+      expect(metadata).not.toContainEqual(
+        expect.objectContaining({
+          _id: db.generateUserMetadataID(user1._id!),
+        })
+      )
+      expect(metadata).not.toContainEqual(
+        expect.objectContaining({
+          _id: db.generateUserMetadataID(user2._id!),
+        })
+      )
       await syncGlobalUsers()
 
-      const metadata = await rawUserMetadata()
-      expect(metadata).toHaveLength(3)
+      metadata = await rawUserMetadata()
       expect(metadata).toContainEqual(
         expect.objectContaining({
           _id: db.generateUserMetadataID(user1._id!),
@@ -62,7 +71,6 @@ describe("syncGlobalUsers", () => {
       await syncGlobalUsers()
 
       const metadata = await rawUserMetadata()
-      expect(metadata).toHaveLength(1)
       expect(metadata).not.toContainEqual(
         expect.objectContaining({
           _id: db.generateUserMetadataID(user._id!),