@budibase/server 2.3.1 → 2.3.2-alpha.1

package/src/api/routes/tests/{query.spec.js → query.seq.spec.js}

@@ -1,3 +1,6 @@
+const tk = require( "timekeeper")
+tk.freeze(Date.now())
+
 // Mock out postgres for this
 jest.mock("pg")
 jest.mock("node-fetch")
@@ -27,10 +30,15 @@ describe("/queries", () => {
 
   afterAll(setup.afterAll)
 
-  beforeEach(async () => {
+  const setupTest = async()=>{
+
     await config.init()
     datasource = await config.createDatasource()
     query = await config.createQuery()
+  }
+
+  beforeAll(async () => {
+    await setupTest()
   })
 
   async function createInvalidIntegration() {
@@ -101,6 +109,10 @@ describe("/queries", () => {
   })
 
   describe("fetch", () => {
+    beforeEach(async() => {
+      await setupTest()
+    })
+
     it("returns all the queries from the server", async () => {
       const res = await request
         .get(`/api/queries`)
@@ -178,6 +190,10 @@ describe("/queries", () => {
   })
 
   describe("destroy", () => {
+    beforeEach(async() => {
+      await setupTest()
+    })
+
     it("deletes a query and returns a success message", async () => {
       await request
         .delete(`/api/queries/${query._id}/${query._rev}`)
@@ -239,6 +255,10 @@ describe("/queries", () => {
   })
 
   describe("execute", () => {
+    beforeEach(async() => {
+      await setupTest()
+    })
+
     it("should be able to execute the query", async () => {
       const res = await request
         .post(`/api/queries/${query._id}`)

package/src/api/routes/tests/role.spec.js

@@ -10,7 +10,7 @@ describe("/roles", () => {
 
   afterAll(setup.afterAll)
 
-  beforeEach(async () => {
+  beforeAll(async () => {
     await config.init()
   })
 
@@ -60,6 +60,11 @@ describe("/roles", () => {
   })
 
   describe("fetch", () => {
+    beforeAll(async () => {
+      // Recreate the app
+      await config.init()
+    })
+
     it("should list custom roles, plus 2 default roles", async () => {
       const customRole = await config.createRole()
 

package/src/api/routes/tests/routing.spec.js

@@ -16,7 +16,7 @@ describe("/routing", () => {
 
   afterAll(setup.afterAll)
 
-  beforeEach(async () => {
+  beforeAll(async () => {
     await config.init()
     screen = basicScreen()
     screen.routing.route = route

package/src/api/routes/tests/row.spec.js

@@ -1,3 +1,8 @@
+const tk = require( "timekeeper")
+const timestamp = new Date("2023-01-26T11:48:57.597Z").toISOString()
+tk.freeze(timestamp)
+
+
 const { outputProcessing } = require("../../../utilities/rowProcessor")
 const setup = require("./utilities")
 const { basicRow } = setup.structures
@@ -20,8 +25,11 @@ describe("/rows", () => {
 
   afterAll(setup.afterAll)
 
-  beforeEach(async () => {
+  beforeAll(async () => {
     await config.init()
+  })
+
+  beforeEach(async()=>{
     table = await config.createTable()
     row = basicRow(table._id)
   })
@@ -111,8 +119,8 @@ describe("/rows", () => {
         _id: existing._id,
         _rev: existing._rev,
         type: "row",
-        createdAt: "2020-01-01T00:00:00.000Z",
-        updatedAt: "2020-01-01T00:00:00.000Z",
+        createdAt: timestamp,
+        updatedAt: timestamp,
       })
       await assertQueryUsage(queryUsage + 1)
     })

package/src/api/routes/tests/screen.spec.js

@@ -10,7 +10,7 @@ describe("/screens", () => {
 
   afterAll(setup.afterAll)
 
-  beforeEach(async () => {
+  beforeAll(async () => {
     await config.init()
     screen = await config.createScreen()
   })

package/src/api/routes/tests/static.spec.js

@@ -8,7 +8,8 @@ describe("/static", () => {
 
   afterAll(setup.afterAll)
 
-  beforeEach(async () => {
+  beforeAll(async () => {
+    config.modeSelf()
     app = await config.init()
   })
 

package/src/api/routes/tests/table.spec.js

@@ -10,7 +10,7 @@ describe("/tables", () => {
 
   afterAll(setup.afterAll)
 
-  beforeEach(async () => {
+  beforeAll(async () => {
     const app = await config.init()
     appId = app.appId
   })

package/src/api/routes/tests/templates.spec.js

@@ -6,7 +6,7 @@ describe("/templates", () => {
 
   afterAll(setup.afterAll)
 
-  beforeEach(async () => {
+  beforeAll(async () => {
     await config.init()
   })
 

package/src/api/routes/tests/user.spec.js

@@ -3,6 +3,8 @@ const { checkPermissionsEndpoint } = require("./utilities/TestFunctions")
 const setup = require("./utilities")
 const { BUILTIN_ROLE_IDS } = roles
 
+jest.setTimeout(30000)
+
 jest.mock("../../../utilities/workerRequests", () => ({
   getGlobalUsers: jest.fn(() => {
     return {}
@@ -19,6 +21,7 @@ describe("/users", () => {
 
   afterAll(setup.afterAll)
 
+  // For some reason this cannot be a beforeAll or the test "should be able to update the user" fail
   beforeEach(async () => {
     await config.init()
   })

package/src/api/routes/tests/utilities/TestFunctions.ts

@@ -4,6 +4,8 @@ import { AppStatus } from "../../../../db/utils"
 import { roles, tenancy, context } from "@budibase/backend-core"
 import { TENANT_ID } from "../../../../tests/utilities/structures"
 import env from "../../../../environment"
+import { db } from "@budibase/backend-core"
+import Nano from "@budibase/nano"
 
 class Request {
   appId: any
@@ -30,7 +32,10 @@ export const getAllTableRows = async (config: any) => {
   return req.body
 }
 
-export const clearAllApps = async (tenantId = TENANT_ID) => {
+export const clearAllApps = async (
+  tenantId = TENANT_ID,
+  exceptions: Array<string> = []
+) => {
   await tenancy.doInTenant(tenantId, async () => {
     const req: any = { query: { status: AppStatus.DEV }, user: { tenantId } }
     await appController.fetch(req)
@@ -38,7 +43,7 @@ export const clearAllApps = async (tenantId = TENANT_ID) => {
     if (!apps || apps.length <= 0) {
       return
     }
-    for (let app of apps) {
+    for (let app of apps.filter((x: any) => !exceptions.includes(x.appId))) {
       const { appId } = app
       const req = new Request(null, { appId })
       await runRequest(appId, appController.destroy, req)
@@ -55,6 +60,24 @@ export const clearAllAutomations = async (config: any) => {
   }
 }
 
+export const wipeDb = async () => {
+  const couchInfo = db.getCouchInfo()
+  const nano = Nano({
+    url: couchInfo.url,
+    requestDefaults: {
+      headers: {
+        Authorization: couchInfo.cookie,
+      },
+    },
+    parseUrl: false,
+  })
+  let dbs
+  do {
+    dbs = await nano.db.list()
+    await Promise.all(dbs.map(x => nano.db.destroy(x)))
+  } while (dbs.length)
+}
+
 export const createRequest = (
   request: any,
   method: any,

package/src/api/routes/tests/utilities/index.ts

@@ -1,5 +1,6 @@
 import TestConfig from "../../../../tests/utilities/TestConfiguration"
 import env from "../../../../environment"
+import supertest from "supertest"
 export * as structures from "../../../../tests/utilities/structures"
 
 function user() {
@@ -44,7 +45,8 @@ export function delay(ms: number) {
   return new Promise(resolve => setTimeout(resolve, ms))
 }
 
-let request: any, config: any
+let request: supertest.SuperTest<supertest.Test> | undefined | null,
+  config: TestConfig | null
 
 export function beforeAll() {
   config = new TestConfig()
@@ -65,14 +67,14 @@ export function getRequest() {
   if (!request) {
     beforeAll()
   }
-  return request
+  return request!
 }
 
 export function getConfig() {
   if (!config) {
     beforeAll()
   }
-  return config
+  return config!
 }
 
 export async function switchToSelfHosted(func: any) {

package/src/api/routes/tests/view.spec.js

@@ -28,8 +28,11 @@ describe("/views", () => {
 
   afterAll(setup.afterAll)
 
-  beforeEach(async () => {
+  beforeAll(async () => {
     await config.init()
+  })
+  
+  beforeEach(async() => {
     table = await config.createTable(priceTable())
   })
 

package/src/api/routes/tests/webhook.spec.js

@@ -9,7 +9,8 @@ describe("/webhooks", () => {
 
   afterAll(setup.afterAll)
 
-  beforeEach(async () => {
+  const setupTest = async () => {
+    config.modeSelf()
     await config.init()
     const autoConfig = basicAutomation()
     autoConfig.definition.trigger = {
@@ -18,7 +19,9 @@ describe("/webhooks", () => {
     }
     await config.createAutomation(autoConfig)
     webhook = await config.createWebhook()
-  })
+  }
+
+  beforeAll(setupTest)
 
   describe("create", () => {
     it("should create a webhook successfully", async () => {
@@ -44,6 +47,8 @@ describe("/webhooks", () => {
   })
 
   describe("fetch", () => {
+    beforeAll(setupTest)
+
     it("returns the correct routing for basic user", async () => {
       const res = await request
         .get(`/api/webhooks`)
@@ -64,6 +69,8 @@ describe("/webhooks", () => {
   })
 
   describe("delete", () => {
+    beforeAll(setupTest)
+    
     it("should successfully delete", async () => {
       const res = await request
         .delete(`/api/webhooks/${webhook._id}/${webhook._rev}`)
@@ -84,6 +91,8 @@ describe("/webhooks", () => {
   })
 
   describe("build schema", () => {
+    beforeAll(setupTest)
+
     it("should allow building a schema", async () => {
       const res = await request
         .post(`/api/webhooks/schema/${config.getAppId()}/${webhook._id}`)

package/src/app.ts

@@ -62,6 +62,7 @@ initialiseWebsockets(server)
 
 let shuttingDown = false,
   errCode = 0
+
 server.on("close", async () => {
   // already in process
   if (shuttingDown) {
@@ -71,7 +72,7 @@ server.on("close", async () => {
   console.log("Server Closed")
   await automations.shutdown()
   await redis.shutdown()
-  await events.shutdown()
+  events.shutdown()
   await Thread.shutdown()
   api.shutdown()
   if (!env.isTest()) {

package/src/automations/tests/automation.spec.js

@@ -21,7 +21,7 @@ const setup = require("./utilities")
 describe("Run through some parts of the automations system", () => {
   let config = setup.getConfig()
 
-  beforeEach(async () => {
+  beforeAll(async () => {
     await automation.init()
     await config.init()
   })
@@ -29,9 +29,9 @@ describe("Run through some parts of the automations system", () => {
   afterAll(setup.afterAll)
 
   it("should be able to init in builder", async () => {
-    await triggers.externalTrigger(basicAutomation(), { a: 1, appId: "app_123" })
-    await wait(100)
-    expect(thread.execute).toHaveBeenCalled()
+      await triggers.externalTrigger(basicAutomation(), { a: 1, appId: config.appId })
+      await wait(100)
+      expect(thread.execute).toHaveBeenCalled()
   })
 
   it("should check coercion", async () => {

package/src/automations/tests/bash.spec.js

@@ -3,7 +3,7 @@ const setup = require("./utilities")
 describe("test the bash action", () => {
     let config = setup.getConfig()
 
-    beforeEach(async () => {
+    beforeAll(async () => {
         await config.init()
     })
     afterAll(setup.afterAll)

package/src/automations/tests/discord.spec.js

@@ -7,7 +7,7 @@ describe("test the outgoing webhook action", () => {
     let inputs
     let config = setup.getConfig()
 
-    beforeEach(async () => {
+    beforeAll(async () => {
         await config.init()
         inputs = {
             username: "joe_bloggs",

package/src/automations/tests/executeQuery.spec.js

@@ -1,10 +1,9 @@
 const setup = require("./utilities")
 
 describe("test the execute query action", () => {
-    let datasource
     let config = setup.getConfig()
 
-    beforeEach(async () => {
+    beforeAll(async () => {
         await config.init()
 
         await config.createDatasource()
@@ -41,7 +40,7 @@ describe("test the execute query action", () => {
                 query: { queryId: "wrong_id" }
             }
         )
-        expect(res.response).toEqual('{"status":404,"name":"not_found","message":"missing","reason":"missing"}')
+        expect(res.response).toEqual('Error: missing')
         expect(res.success).toEqual(false)
     })
 

package/src/automations/tests/executeScript.spec.js

@@ -3,7 +3,7 @@ const setup = require("./utilities")
 describe("test the execute script action", () => {
     let config = setup.getConfig()
 
-    beforeEach(async () => {
+    beforeAll(async () => {
         await config.init()
     })
     afterAll(setup.afterAll)

package/src/automations/tests/outgoingWebhook.spec.js

@@ -7,7 +7,7 @@ describe("test the outgoing webhook action", () => {
   let inputs
   let config = setup.getConfig()
 
-  beforeEach(async () => {
+  beforeAll(async () => {
     await config.init()
     inputs = {
       requestMethod: "POST",

package/src/automations/tests/sendSmtpEmail.spec.js

@@ -36,7 +36,7 @@ const setup = require("./utilities")
 describe("test the outgoing webhook action", () => {
     let inputs
     let config = setup.getConfig()
-    beforeEach(async () => {
+    beforeAll(async () => {
         await config.init()
     })
 

package/src/automations/tests/serverLog.spec.js

@@ -3,7 +3,7 @@ const setup = require("./utilities")
 describe("test the server log action", () => {
     let config = setup.getConfig()
 
-    beforeEach(async () => {
+    beforeAll(async () => {
         await config.init()
         inputs = {
             text: "log message",

package/src/automations/tests/updateRow.spec.js

@@ -4,7 +4,7 @@ describe("test the update row action", () => {
   let table, row, inputs
   let config = setup.getConfig()
 
-  beforeEach(async () => {
+  beforeAll(async () => {
     await config.init()
     table = await config.createTable()
     row = await config.createRow()

package/src/automations/tests/zapier.spec.js

@@ -7,7 +7,7 @@ describe("test the outgoing webhook action", () => {
     let inputs
     let config = setup.getConfig()
 
-    beforeEach(async () => {
+    beforeAll(async () => {
         await config.init()
         inputs = {
             value1: "test",

package/src/db/tests/linkController.spec.js

@@ -9,9 +9,12 @@ describe("test the link controller", () => {
   let config = new TestConfig(false)
   let table1, table2, appId
 
-  beforeEach(async () => {
+  beforeAll(async () => {
     const app = await config.init()
     appId = app.appId
+  })
+
+  beforeEach(async () => {
     const { _id } = await config.createTable()
     table2 = await config.createLinkedTable(RelationshipTypes.MANY_TO_MANY, ["link", "link2"])
     // update table after creating link

package/src/db/tests/linkTests.spec.js

@@ -9,7 +9,7 @@ describe("test link functionality", () => {
 
   describe("getLinkedTable", () => {
     let table
-    beforeEach(async () => {
+    beforeAll(async () => {
       const app = await config.init()
       appId = app.appId
       table = await config.createTable()

package/src/migrations/functions/tests/appUrls.spec.js

@@ -6,7 +6,7 @@ const migration = require("../appUrls")
 describe("run", () => {
   let config = new TestConfig(false)
 
-  beforeEach(async () => {
+  beforeAll(async () => {
     await config.init()
   })
 

package/src/migrations/functions/tests/syncQuotas.spec.js

@@ -11,7 +11,7 @@ const migration = require("../syncQuotas")
 describe("run", () => {
   let config = new TestConfig(false)
 
-  beforeEach(async () => {
+  beforeAll(async () => {
     await config.init()
   })
 

package/src/migrations/functions/tests/userEmailViewCasing.spec.js

@@ -19,7 +19,7 @@ const migration = require("../userEmailViewCasing")
 describe("run", () => {
     let config = new TestConfig(false)
 
-    beforeEach(async () => {
+    beforeAll(async () => {
       await config.init()
     })
 

package/src/migrations/tests/index.spec.ts

@@ -10,8 +10,9 @@ import * as structures from "../../tests/utilities/structures"
 import { MIGRATIONS } from "../"
 import * as helpers from "./helpers"
 
-const { mocks } = require("@budibase/backend-core/tests")
-const timestamp = mocks.date.MOCK_DATE.toISOString()
+import tk from "timekeeper"
+const timestamp = new Date().toISOString()
+tk.freeze(timestamp)
 
 const clearMigrations = async () => {
   const dbs = [context.getDevAppDB(), context.getProdAppDB()]

package/src/sdk/app/backups/exports.ts

@@ -45,12 +45,18 @@ function tarFilesToTmp(tmpDir: string, files: string[]) {
  * @return {*} either a readable stream or a string
  */
 export async function exportDB(dbName: string, opts: ExportOpts = {}) {
+  const exportOpts = {
+    filter: opts?.filter,
+    batch_size: 1000,
+    batch_limit: 5,
+    style: "main_only",
+  }
   return dbCore.doWithDB(dbName, async (db: any) => {
     // Write the dump to file if required
     if (opts?.exportPath) {
       const path = opts?.exportPath
       const writeStream = fs.createWriteStream(path)
-      await db.dump(writeStream, { filter: opts?.filter })
+      await db.dump(writeStream, exportOpts)
       return path
     } else {
       // Stringify the dump in memory if required
@@ -59,7 +65,7 @@ export async function exportDB(dbName: string, opts: ExportOpts = {}) {
       memStream.on("data", (chunk: any) => {
         appString += chunk.toString()
       })
-      await db.dump(memStream, { filter: opts?.filter })
+      await db.dump(memStream, exportOpts)
       return appString
     }
   })

package/src/tests/jestEnv.ts

@@ -3,11 +3,7 @@ import { tmpdir } from "os"
 
 env._set("SELF_HOSTED", "1")
 env._set("NODE_ENV", "jest")
-env._set("JWT_SECRET", "test-jwtsecret")
-env._set("CLIENT_ID", "test-client-id")
+env._set("MULTI_TENANCY", "1")
+// @ts-ignore
 env._set("BUDIBASE_DIR", tmpdir("budibase-unittests"))
 env._set("LOG_LEVEL", "silent")
-env._set("PORT", 0)
-env._set("MINIO_URL", "http://localhost")
-env._set("MINIO_ACCESS_KEY", "test")
-env._set("MINIO_SECRET_KEY", "test")

package/src/tests/jestSetup.ts

@@ -1,9 +1,6 @@
-import { mocks } from "@budibase/backend-core/tests"
-
-// mock all dates to 2020-01-01T00:00:00.000Z
-// use tk.reset() to use real dates in individual tests
-const tk = require("timekeeper")
-tk.freeze(mocks.date.MOCK_DATE)
+import env from "../environment"
+import { env as coreEnv } from "@budibase/backend-core"
+import { testContainerUtils } from "@budibase/backend-core/tests"
 
 if (!process.env.DEBUG) {
   global.console.log = jest.fn() // console.log are ignored in tests
@@ -15,3 +12,5 @@ if (!process.env.CI) {
   // 100 seconds
   jest.setTimeout(100000)
 }
+
+testContainerUtils.setupEnv(env, coreEnv)