@budibase/server 2.3.2-alpha.0 → 2.3.2

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

@@ -3,8 +3,6 @@ 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 {}
@@ -21,7 +19,6 @@ 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,8 +4,6 @@ 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
@@ -32,10 +30,7 @@ export const getAllTableRows = async (config: any) => {
   return req.body
 }
 
-export const clearAllApps = async (
-  tenantId = TENANT_ID,
-  exceptions: Array<string> = []
-) => {
+export const clearAllApps = async (tenantId = TENANT_ID) => {
   await tenancy.doInTenant(tenantId, async () => {
     const req: any = { query: { status: AppStatus.DEV }, user: { tenantId } }
     await appController.fetch(req)
@@ -43,7 +38,7 @@ export const clearAllApps = async (
     if (!apps || apps.length <= 0) {
       return
     }
-    for (let app of apps.filter((x: any) => !exceptions.includes(x.appId))) {
+    for (let app of apps) {
       const { appId } = app
       const req = new Request(null, { appId })
       await runRequest(appId, appController.destroy, req)
@@ -60,24 +55,6 @@ 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,6 +1,5 @@
 import TestConfig from "../../../../tests/utilities/TestConfiguration"
 import env from "../../../../environment"
-import supertest from "supertest"
 export * as structures from "../../../../tests/utilities/structures"
 
 function user() {
@@ -45,8 +44,7 @@ export function delay(ms: number) {
   return new Promise(resolve => setTimeout(resolve, ms))
 }
 
-let request: supertest.SuperTest<supertest.Test> | undefined | null,
-  config: TestConfig | null
+let request: any, config: any
 
 export function beforeAll() {
   config = new TestConfig()
@@ -67,14 +65,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,11 +28,8 @@ describe("/views", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
-  })
-  
-  beforeEach(async() => {
     table = await config.createTable(priceTable())
   })
 

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

@@ -9,8 +9,7 @@ describe("/webhooks", () => {
 
   afterAll(setup.afterAll)
 
-  const setupTest = async () => {
-    config.modeSelf()
+  beforeEach(async () => {
     await config.init()
     const autoConfig = basicAutomation()
     autoConfig.definition.trigger = {
@@ -19,9 +18,7 @@ describe("/webhooks", () => {
     }
     await config.createAutomation(autoConfig)
     webhook = await config.createWebhook()
-  }
-
-  beforeAll(setupTest)
+  })
 
   describe("create", () => {
     it("should create a webhook successfully", async () => {
@@ -47,8 +44,6 @@ describe("/webhooks", () => {
   })
 
   describe("fetch", () => {
-    beforeAll(setupTest)
-
     it("returns the correct routing for basic user", async () => {
       const res = await request
         .get(`/api/webhooks`)
@@ -69,8 +64,6 @@ describe("/webhooks", () => {
   })
 
   describe("delete", () => {
-    beforeAll(setupTest)
-    
     it("should successfully delete", async () => {
       const res = await request
         .delete(`/api/webhooks/${webhook._id}/${webhook._rev}`)
@@ -91,8 +84,6 @@ 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,7 +62,6 @@ initialiseWebsockets(server)
 
 let shuttingDown = false,
   errCode = 0
-
 server.on("close", async () => {
   // already in process
   if (shuttingDown) {
@@ -72,7 +71,7 @@ server.on("close", async () => {
   console.log("Server Closed")
   await automations.shutdown()
   await redis.shutdown()
-  events.shutdown()
+  await 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()
 
-  beforeAll(async () => {
+  beforeEach(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: config.appId })
-      await wait(100)
-      expect(thread.execute).toHaveBeenCalled()
+    await triggers.externalTrigger(basicAutomation(), { a: 1, appId: "app_123" })
+    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()
 
-    beforeAll(async () => {
+    beforeEach(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()
 
-    beforeAll(async () => {
+    beforeEach(async () => {
         await config.init()
         inputs = {
             username: "joe_bloggs",

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

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

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

@@ -9,12 +9,9 @@ describe("test the link controller", () => {
   let config = new TestConfig(false)
   let table1, table2, appId
 
-  beforeAll(async () => {
+  beforeEach(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
-    beforeAll(async () => {
+    beforeEach(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)
 
-  beforeAll(async () => {
+  beforeEach(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)
 
-  beforeAll(async () => {
+  beforeEach(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)
 
-    beforeAll(async () => {
+    beforeEach(async () => {
       await config.init()
     })
 

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

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

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

@@ -45,18 +45,12 @@ 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, exportOpts)
+      await db.dump(writeStream, { filter: opts?.filter })
       return path
     } else {
       // Stringify the dump in memory if required
@@ -65,7 +59,7 @@ export async function exportDB(dbName: string, opts: ExportOpts = {}) {
       memStream.on("data", (chunk: any) => {
         appString += chunk.toString()
       })
-      await db.dump(memStream, exportOpts)
+      await db.dump(memStream, { filter: opts?.filter })
       return appString
     }
   })

package/src/tests/jestEnv.ts

@@ -3,7 +3,11 @@ import { tmpdir } from "os"
 
 env._set("SELF_HOSTED", "1")
 env._set("NODE_ENV", "jest")
-env._set("MULTI_TENANCY", "1")
-// @ts-ignore
+env._set("JWT_SECRET", "test-jwtsecret")
+env._set("CLIENT_ID", "test-client-id")
 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,6 +1,9 @@
-import env from "../environment"
-import { env as coreEnv } from "@budibase/backend-core"
-import { testContainerUtils } from "@budibase/backend-core/tests"
+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)
 
 if (!process.env.DEBUG) {
   global.console.log = jest.fn() // console.log are ignored in tests
@@ -12,5 +15,3 @@ if (!process.env.CI) {
   // 100 seconds
   jest.setTimeout(100000)
 }
-
-testContainerUtils.setupEnv(env, coreEnv)