Fixing all broken test cases after breaking out context fully from jestSetup/backend-core jest loading.

packages/backend-core/src/auth/tests/auth.spec.ts

@@ -1,4 +1,4 @@
-import { structures } from "../../../tests/core"
+import { structures } from "../../../tests"
 import { testEnv } from "../../../tests/extra"
 import * as auth from "../auth"
 import * as events from "../../events"

packages/backend-core/src/cache/tests/writethrough.spec.ts

@@ -1,8 +1,5 @@
-import {
-  structures,
-  DBTestConfiguration,
-  expectFunctionWasCalledTimesWith,
-} from "../../../tests"
+import { structures, expectFunctionWasCalledTimesWith } from "../../../tests"
+import { DBTestConfiguration } from "../../../tests/extra"
 import { Writethrough } from "../writethrough"
 import { getDB } from "../../db"
 import tk from "timekeeper"

packages/backend-core/src/configs/tests/configs.spec.ts

@@ -1,9 +1,5 @@
-import {
-  DBTestConfiguration,
-  generator,
-  testEnv,
-  structures,
-} from "../../../tests"
+import { generator, structures } from "../../../tests"
+import { DBTestConfiguration, testEnv } from "../../../tests/extra"
 import { ConfigType } from "@budibase/types"
 import env from "../../environment"
 import * as configs from "../configs"

packages/backend-core/src/context/mainContext.ts

@@ -2,7 +2,7 @@
 // store an app ID to pretend there is a context
 import env from "../environment"
 import Context from "./Context"
-import * as conversions from "../db/conversions"
+import * as conversions from "../docIds/conversions"
 import { getDB } from "../db/db"
 import {
   DocumentType,

packages/backend-core/src/context/tests/index.spec.ts

@@ -1,4 +1,4 @@
-import { testEnv } from "../../../tests"
+import { testEnv } from "../../../tests/extra"
 const context = require("../")
 const { DEFAULT_TENANT_ID } = require("../../constants")
 

packages/backend-core/src/db/couch/DatabaseImpl.ts

@@ -15,7 +15,7 @@ import { getCouchInfo } from "./connections"
 import { directCouchCall } from "./utils"
 import { getPouchDB } from "./pouchDB"
 import { WriteStream, ReadStream } from "fs"
-import { newid } from "../../newid"
+import { newid } from "../../docIds/newid"
 
 function buildNano(couchInfo: { url: string; cookie: string }) {
   return Nano({

packages/backend-core/src/db/documents/index.ts

@@ -1,2 +0,0 @@
-export * from "./ids"
-export * from "./params"

packages/backend-core/src/db/index.ts

@@ -2,7 +2,7 @@ export * from "./couch"
 export * from "./db"
 export * from "./utils"
 export * from "./views"
-export * from "./conversions"
+export * from "../docIds/conversions"
 export { default as Replication } from "./Replication"
 // exports to support old export structure
 export * from "../constants/db"

packages/backend-core/src/db/tests/lucene.spec.ts

@@ -1,4 +1,4 @@
-import { newid } from "../../newid"
+import { newid } from "../../docIds/newid"
 import { getDB } from "../db"
 import { Database } from "@budibase/types"
 import { QueryBuilder, paginatedSearch, fullSearch } from "../lucene"

packages/backend-core/src/db/tests/utils.spec.ts

@@ -3,7 +3,7 @@ import {
   getProdAppID,
   isDevAppID,
   isProdAppID,
-} from "../conversions"
+} from "../../docIds/conversions"
 import { generateAppID } from "../utils"
 
 describe("utils", () => {

packages/backend-core/src/db/utils.ts

@@ -1,16 +1,12 @@
 import env from "../environment"
-import {
-  DEFAULT_TENANT_ID,
-  SEPARATOR,
-  DocumentType,
-} from "../constants"
+import { DEFAULT_TENANT_ID, SEPARATOR, DocumentType } from "../constants"
 import { getTenantId, getGlobalDBName } from "../context"
 import { doWithDB, directCouchAllDbs } from "./db"
 import { getAppMetadata } from "../cache/appMetadata"
-import { isDevApp, isDevAppID, getProdAppID } from "./conversions"
+import { isDevApp, isDevAppID, getProdAppID } from "../docIds/conversions"
 import { App, Database } from "@budibase/types"
-import { getStartEndKeyURL } from "./documents"
-export * from "./documents"
+import { getStartEndKeyURL } from "../docIds"
+export * from "../docIds"
 
 /**
  * if in production this will use the CouchDB _all_dbs call to retrieve a list of databases. If testing

packages/backend-core/src/docIds/ids.ts

@@ -3,8 +3,8 @@ import {
   DocumentType,
   InternalTable,
   SEPARATOR,
-} from "../../constants"
-import { newid } from "../../newid"
+} from "../constants"
+import { newid } from "./newid"
 
 /**
  * Generates a new app ID.

packages/backend-core/src/docIds/index.ts

@@ -0,0 +1,2 @@
+export * from "./ids"
+export * from "./params"

packages/backend-core/src/docIds/params.ts

@@ -4,8 +4,8 @@ import {
   SEPARATOR,
   UNICODE_MAX,
   ViewName,
-} from "../../constants"
-import { getProdAppID } from "../conversions"
+} from "../constants"
+import { getProdAppID } from "./conversions"
 
 /**
  * If creating DB allDocs/query params with only a single top level ID this can be used, this
@@ -63,7 +63,6 @@ export function getQueryIndex(viewName: ViewName) {
   return `database/${viewName}`
 }
 
-
 /**
  * Check if a given ID is that of a table.
  * @returns {boolean}
@@ -122,7 +121,6 @@ export function getUserMetadataParams(userId?: string | null, otherProps = {}) {
   return getRowParams(InternalTable.USER_METADATA, userId, otherProps)
 }
 
-
 export function getUsersByAppParams(appId: any, otherProps: any = {}) {
   const prodAppId = getProdAppID(appId)
   return {

packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts

@@ -1,4 +1,4 @@
-import { testEnv } from "../../../../../tests"
+import { testEnv } from "../../../../../tests/extra"
 import PosthogProcessor from "../PosthogProcessor"
 import { Event, IdentityType, Hosting } from "@budibase/types"
 const tk = require("timekeeper")

packages/backend-core/src/middleware/passport/sso/tests/sso.spec.ts

@@ -1,4 +1,5 @@
-import { structures, testEnv, mocks } from "../../../../../tests"
+import { structures, mocks } from "../../../../../tests"
+import { testEnv } from "../../../../../tests/extra"
 import { SSOAuthDetails, User } from "@budibase/types"
 
 import { HTTPError } from "../../../../errors"

packages/backend-core/src/migrations/tests/migrations.spec.ts

@@ -1,4 +1,4 @@
-import { testEnv, DBTestConfiguration } from "../../../tests"
+import { testEnv, DBTestConfiguration } from "../../../tests/extra"
 import * as migrations from "../index"
 import * as context from "../../context"
 import { MigrationType } from "@budibase/types"

packages/backend-core/src/objectStore/buckets/tests/app.spec.ts

@@ -1,6 +1,6 @@
 import * as app from "../app"
 import { getAppFileUrl } from "../app"
-import { testEnv } from "../../../../tests"
+import { testEnv } from "../../../../tests/extra"
 
 describe("app", () => {
   beforeEach(() => {

packages/backend-core/src/objectStore/buckets/tests/global.spec.ts

@@ -1,5 +1,5 @@
 import * as global from "../global"
-import { testEnv } from "../../../../tests"
+import { testEnv } from "../../../../tests/extra"
 
 describe("global", () => {
   describe("getGlobalFileUrl", () => {

packages/backend-core/src/objectStore/buckets/tests/plugins.spec.ts

@@ -1,5 +1,6 @@
 import * as plugins from "../plugins"
-import { structures, testEnv } from "../../../../tests"
+import { structures } from "../../../../tests"
+import { testEnv } from "../../../../tests/extra"
 
 describe("plugins", () => {
   describe("enrichPluginURLs", () => {

packages/backend-core/src/platform/tests/tenants.spec.ts

@@ -1,4 +1,5 @@
-import { DBTestConfiguration, structures } from "../../../tests"
+import { structures } from "../../../tests"
+import { DBTestConfiguration } from "../../../tests/extra"
 import * as tenants from "../tenants"
 
 describe("tenants", () => {

packages/backend-core/src/utils/hashing.ts

@@ -1,5 +1,5 @@
 import env from "../environment"
-export * from "../newid"
+export * from "../docIds/newid"
 const bcrypt = env.JS_BCRYPT ? require("bcryptjs") : require("bcrypt")
 
 const SALT_ROUNDS = env.SALT_ROUNDS || 10

packages/backend-core/src/utils/tests/utils.spec.ts

@@ -1,4 +1,5 @@
-import { structures, DBTestConfiguration } from "../../../tests"
+import { structures } from "../../../tests"
+import { DBTestConfiguration } from "../../../tests/extra"
 import * as utils from "../../utils"
 import * as db from "../../db"
 import { Header } from "../../constants"

packages/backend-core/tests/core/index.ts

@@ -1 +0,0 @@
-export * from "./utilities"

packages/backend-core/tests/core/utilities/mocks/events.ts

@@ -1 +1 @@
-jest.mock("../../../src/events")
+jest.mock("../../../../src/events")

packages/backend-core/tests/core/utilities/mocks/fetch.ts

@@ -1,4 +1,11 @@
-const mockFetch = jest.fn()
+const mockFetch = jest.fn((url: any, opts: any) => {
+  const fetch = jest.requireActual("node-fetch")
+  const env = jest.requireActual("../../../../src/environment").default
+  if (url.includes(env.COUCH_DB_URL)) {
+    return fetch(url, opts)
+  }
+  return undefined
+})
 
 const enable = () => {
   jest.mock("node-fetch", () => mockFetch)

packages/backend-core/tests/core/utilities/mocks/index.ts

@@ -1,5 +1,5 @@
-jest.mock("../../../src/accounts")
-import * as _accounts from "../../../src/accounts"
+jest.mock("../../../../src/accounts")
+import * as _accounts from "../../../../src/accounts"
 export const accounts = jest.mocked(_accounts)
 
 export * as date from "./date"

packages/backend-core/tests/core/utilities/structures/accounts.ts

@@ -1,5 +1,5 @@
 import { generator, uuid } from "."
-import { generateGlobalUserID } from "../../../src/db/documents"
+import { generateGlobalUserID } from "../../../../src/docIds"
 import {
   Account,
   AccountSSOProvider,

packages/backend-core/tests/core/utilities/structures/apps.ts

@@ -1,6 +1,6 @@
 import { generator } from "."
 import { App } from "@budibase/types"
-import { DEFAULT_TENANT_ID, DocumentType } from "../../../src/constants"
+import { DEFAULT_TENANT_ID, DocumentType } from "../../../../src/constants"
 
 export function app(id: string): App {
   return {

packages/backend-core/tests/core/utilities/structures/db.ts

@@ -1,5 +1,5 @@
 import { structures } from ".."
-import { newid } from "../../../src/newid"
+import { newid } from "../../../../src/docIds/newid"
 
 export function id() {
   return `db_${newid()}`

packages/backend-core/tests/core/utilities/structures/tenants.ts

@@ -1,4 +1,4 @@
-import { newid } from "../../../src/newid"
+import { newid } from "../../../../src/docIds/newid"
 
 export function id() {
   return `tenant-${newid()}`

packages/backend-core/tests/extra/DBTestConfiguration.ts

@@ -1,5 +1,5 @@
-import "./mocks"
-import * as structures from "./structures"
+import "../core/utilities/mocks"
+import * as structures from "../core/utilities/structures"
 import * as testEnv from "./testEnv"
 import * as context from "../../src/context"
 

packages/backend-core/tests/extra/index.ts

@@ -1,2 +1,2 @@
 export * as testEnv from "./testEnv"
-export * as DBTestConfiguration from "./DBTestConfiguration"
+export { default as DBTestConfiguration } from "./DBTestConfiguration"

packages/backend-core/tests/extra/testEnv.ts

@@ -1,6 +1,6 @@
 import env from "../../src/environment"
 import * as context from "../../src/context"
-import * as structures from "../core"
+import * as structures from "../core/utilities/structures"
 
 // TENANCY
 

packages/backend-core/tests/index.ts

@@ -0,0 +1 @@
+export * from "./core/utilities"

packages/backend-core/tests/jestSetup.ts

@@ -1,7 +1,7 @@
-import "./logging"
+import "./core/logging"
 import env from "../src/environment"
 import { cleanup } from "../src/timers"
-import { mocks, testContainerUtils } from "./utilities"
+import { mocks, testContainerUtils } from "./core/utilities"
 
 // must explicitly enable fetch mock
 mocks.fetch.enable()