From 1dabf71f687f1f1f64421f9389365d33b090be8f Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Mon, 30 Jan 2023 13:35:09 +0000
Subject: [PATCH] Run conflicting tests in sequential mode

---
 packages/backend-core/jest.config.ts          | 21 ++++++++++++++++---
 packages/backend-core/package.json            |  1 +
 ...spec.js => third-party-common.seq.spec.js} |  0
 packages/backend-core/yarn.lock               | 13 ++++++++----
 4 files changed, 28 insertions(+), 7 deletions(-)
 rename packages/backend-core/src/middleware/passport/tests/{third-party-common.spec.js => third-party-common.seq.spec.js} (100%)

diff --git a/packages/backend-core/jest.config.ts b/packages/backend-core/jest.config.ts
index 084084bea5..ddccfbb1b4 100644
--- a/packages/backend-core/jest.config.ts
+++ b/packages/backend-core/jest.config.ts
@@ -1,7 +1,7 @@
-import { Config } from "@jest/types"
+import { Config } from "jest"
 const preset = require("ts-jest/jest-preset")
 
-const config: Config.InitialOptions = {
+const configSettings = {
   ...preset,
   preset: "@trendyol/jest-testcontainers",
   setupFiles: ["./tests/jestEnv.ts"],
@@ -15,11 +15,26 @@ const config: Config.InitialOptions = {
 
 if (!process.env.CI) {
   // use sources when not in CI
-  config.moduleNameMapper = {
+  configSettings.moduleNameMapper = {
     "@budibase/types": "<rootDir>/../types/src",
   }
 } else {
   console.log("Running tests with compiled dependency sources")
 }
 
+const config: Config = {
+  projects: [
+    {
+      ...configSettings,
+      displayName: "sequential test",
+      testMatch: ["<rootDir>/**/*.seq.spec.[jt]s"],
+      runner: "jest-serial-runner",
+    },
+    {
+      ...configSettings,
+      testMatch: ["<rootDir>/**/!(*.seq).spec.[jt]s"],
+    },
+  ],
+}
+
 export default config
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 0ef05cf69b..645f11db39 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -78,6 +78,7 @@
     "chance": "1.1.8",
     "ioredis-mock": "5.8.0",
     "jest": "28.1.1",
+    "jest-serial-runner": "^1.2.1",
     "koa": "2.13.4",
     "nodemon": "2.0.16",
     "pouchdb-adapter-memory": "7.2.2",
diff --git a/packages/backend-core/src/middleware/passport/tests/third-party-common.spec.js b/packages/backend-core/src/middleware/passport/tests/third-party-common.seq.spec.js
similarity index 100%
rename from packages/backend-core/src/middleware/passport/tests/third-party-common.spec.js
rename to packages/backend-core/src/middleware/passport/tests/third-party-common.seq.spec.js
diff --git a/packages/backend-core/yarn.lock b/packages/backend-core/yarn.lock
index e64c9539a6..e5431ffaaa 100644
--- a/packages/backend-core/yarn.lock
+++ b/packages/backend-core/yarn.lock
@@ -487,10 +487,10 @@
     qs "^6.11.0"
     tough-cookie "^4.1.2"
 
-"@budibase/types@2.2.12-alpha.40":
-  version "2.2.12-alpha.40"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.40.tgz#114c2de00f502736d90b18238ed31eb0b2ef6a19"
-  integrity sha512-YLCycoImazSypq89w+1l3LHEMZ9qEh5NPBJ5DQ07Un/1Sq5H4QxVLK8r7Z1VtxIqtAh95H3nMPnAB/vLpJEL8Q==
+"@budibase/types@2.2.12-alpha.41":
+  version "2.2.12-alpha.41"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.41.tgz#662115c5ba09f3c2057a96321e233c819cfae84b"
+  integrity sha512-+uzr668cuvDTMqy7roWiG/qQzOzQO7uWYtysaHPsQQG5PxA0ZuwixJOvvX1qOr1rgv9Is54p9J7dvzvtKW/wAw==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"
@@ -3757,6 +3757,11 @@ jest-runtime@^28.1.3:
     slash "^3.0.0"
     strip-bom "^4.0.0"
 
+jest-serial-runner@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/jest-serial-runner/-/jest-serial-runner-1.2.1.tgz#0f5f8dbe6f077119bd1fdd7e8518f92353c194d5"
+  integrity sha512-d59fF+7HdjNvQEL7B4WyFE+f8q5tGzlNUqtOnxTrT1ofun7O6/Lgm/j255BBgCY2fmSue/34M7Xy9+VWRByP0Q==
+
 jest-snapshot@^28.1.3:
   version "28.1.3"
   resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-28.1.3.tgz#17467b3ab8ddb81e2f605db05583d69388fc0668"