@budibase/server 2.3.18-alpha.8 → 2.3.18

package/src/api/routes/tests/application.spec.ts

@@ -14,22 +14,18 @@ jest.mock("../../../utilities/redis", () => ({
 import { clearAllApps, checkBuilderEndpoint } from "./utilities/TestFunctions"
 import * as setup from "./utilities"
 import { AppStatus } from "../../../db/utils"
-import { events, utils } from "@budibase/backend-core"
+import { events } from "@budibase/backend-core"
 import env from "../../../environment"
 
-jest.setTimeout(15000)
-
 describe("/applications", () => {
   let request = setup.getRequest()
   let config = setup.getConfig()
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
-    await config.init()
-  })
-
   beforeEach(async () => {
+    await clearAllApps()
+    await config.init()
     jest.clearAllMocks()
   })
 
@@ -37,7 +33,7 @@ describe("/applications", () => {
     it("creates empty app", async () => {
       const res = await request
         .post("/api/applications")
-        .field("name", utils.newid())
+        .field("name", "My App")
         .set(config.defaultHeaders())
         .expect("Content-Type", /json/)
         .expect(200)
@@ -48,7 +44,7 @@ describe("/applications", () => {
     it("creates app from template", async () => {
       const res = await request
         .post("/api/applications")
-        .field("name", utils.newid())
+        .field("name", "My App")
         .field("useTemplate", "true")
         .field("templateKey", "test")
         .field("templateString", "{}") // override the file download
@@ -63,7 +59,7 @@ describe("/applications", () => {
     it("creates app from file", async () => {
       const res = await request
         .post("/api/applications")
-        .field("name", utils.newid())
+        .field("name", "My App")
         .field("useTemplate", "true")
         .set(config.defaultHeaders())
         .attach("templateFile", "src/api/routes/tests/data/export.txt")
@@ -110,11 +106,6 @@ describe("/applications", () => {
   })
 
   describe("fetch", () => {
-    beforeEach(async () => {
-      // Clean all apps but the onde from config
-      await clearAllApps(config.getTenantId(), [config.getAppId()!])
-    })
-
     it("lists all applications", async () => {
       await config.createApp("app1")
       await config.createApp("app2")
@@ -275,11 +266,6 @@ describe("/applications", () => {
   })
 
   describe("unpublish", () => {
-    beforeEach(async () => {
-      // We want to republish as the unpublish will delete the prod app
-      await config.publish()
-    })
-
     it("should unpublish app with dev app ID", async () => {
       const appId = config.getAppId()
       await request

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

@@ -7,7 +7,7 @@ describe("/authenticate", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
   })
 
@@ -18,7 +18,7 @@ describe("/authenticate", () => {
         .set(config.defaultHeaders())
         .expect("Content-Type", /json/)
         .expect(200)
-      expect(res.body._id).toEqual(generateUserMetadataID(config.user._id))
+      expect(res.body._id).toEqual(generateUserMetadataID("us_uuid1"))
     })
   })
 })

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

@@ -10,16 +10,12 @@ const MAX_RETRIES = 4
 const { TRIGGER_DEFINITIONS, ACTION_DEFINITIONS } = require("../../../automations")
 const { events } = require("@budibase/backend-core")
 
-
-jest.setTimeout(30000)
-
 describe("/automations", () => {
   let request = setup.getRequest()
   let config = setup.getConfig()
 
   afterAll(setup.afterAll)
 
-  // For some reason this cannot be a beforeAll or the test "tests the automation successfully" fail
   beforeEach(async () => {
     await config.init()
   })
@@ -149,7 +145,7 @@ describe("/automations", () => {
         let elements = await getAllTableRows(config)
         // don't test it unless there are values to test
         if (elements.length > 1) {
-          expect(elements.length).toBeGreaterThanOrEqual(MAX_RETRIES)
+          expect(elements.length).toEqual(5)
           expect(elements[0].name).toEqual("Test")
           expect(elements[0].description).toEqual("TEST")
           return
@@ -309,7 +305,7 @@ describe("/automations", () => {
         .expect('Content-Type', /json/)
         .expect(200)
 
-      expect(res.body[0]).toEqual(expect.objectContaining(autoConfig))
+        expect(res.body[0]).toEqual(expect.objectContaining(autoConfig))
     })
 
     it("should apply authorization to endpoint", async () => {

package/src/api/routes/tests/backup.spec.ts

@@ -1,8 +1,17 @@
+jest.mock("@budibase/backend-core", () => {
+  const core = jest.requireActual("@budibase/backend-core")
+  return {
+    ...core,
+    objectStore: {
+      budibaseTempDir: core.objectStore.budibaseTempDir,
+    },
+  }
+})
+
 import * as setup from "./utilities"
 import { events } from "@budibase/backend-core"
 import sdk from "../../../sdk"
 import { checkBuilderEndpoint } from "./utilities/TestFunctions"
-
 describe("/backups", () => {
   let request = setup.getRequest()
   let config = setup.getConfig()
@@ -19,6 +28,7 @@ describe("/backups", () => {
         .get(`/api/backups/export?appId=${config.getAppId()}&appname=test`)
         .set(config.defaultHeaders())
         .expect(200)
+      expect(res.text).toBeDefined()
       expect(res.headers["content-type"]).toEqual("application/gzip")
       expect(events.app.exported).toBeCalledTimes(1)
     })
@@ -34,9 +44,9 @@ describe("/backups", () => {
 
   describe("calculateBackupStats", () => {
     it("should be able to calculate the backup statistics", async () => {
-      await config.createAutomation()
-      await config.createScreen()
-      let res = await sdk.backups.calculateBackupStats(config.getAppId()!)
+      config.createAutomation()
+      config.createScreen()
+      let res = await sdk.backups.calculateBackupStats(config.getAppId())
       expect(res.automations).toEqual(1)
       expect(res.datasources).toEqual(1)
       expect(res.screens).toEqual(1)

package/src/api/routes/tests/{cloud.seq.spec.ts → cloud.spec.ts}

@@ -1,22 +1,14 @@
-jest.setTimeout(30000)
-
+import { db as dbCore } from "@budibase/backend-core"
 import { AppStatus } from "../../../db/utils"
 
 import * as setup from "./utilities"
 
-import { wipeDb } from "./utilities/TestFunctions"
-
 describe("/cloud", () => {
-  let request = setup.getRequest()!
+  let request = setup.getRequest()
   let config = setup.getConfig()
 
   afterAll(setup.afterAll)
 
-  beforeAll(() => {
-    // Importing is only allowed in self hosted environments
-    config.modeSelf()
-  })
-
   beforeEach(async () => {
     await config.init()
   })
@@ -30,7 +22,19 @@ describe("/cloud", () => {
     it("should be able to import apps", async () => {
       // first we need to delete any existing apps on the system so it looks clean otherwise the
       // import will not run
-      await wipeDb()
+      await request
+        .post(
+          `/api/applications/${dbCore.getProdAppID(
+            config.getAppId()
+          )}/unpublish`
+        )
+        .set(config.defaultHeaders())
+        .expect(204)
+      await request
+        .delete(`/api/applications/${config.getAppId()}`)
+        .set(config.defaultHeaders())
+        .expect("Content-Type", /json/)
+        .expect(200)
 
       // get a count of apps before the import
       const preImportApps = await request

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

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

package/src/api/routes/tests/datasource.spec.ts

@@ -5,10 +5,6 @@ import { checkCacheForDynamicVariable } from "../../../threads/utils"
 import { context, events } from "@budibase/backend-core"
 import sdk from "../../../sdk"
 
-import tk from "timekeeper"
-import { mocks } from "@budibase/backend-core/tests"
-tk.freeze(mocks.date.MOCK_DATE)
-
 let { basicDatasource } = setup.structures
 const pg = require("pg")
 
@@ -19,13 +15,11 @@ describe("/datasources", () => {
 
   afterAll(setup.afterAll)
 
-  async function setupTest() {
+  beforeEach(async () => {
     await config.init()
     datasource = await config.createDatasource()
     jest.clearAllMocks()
-  }
-
-  beforeAll(setupTest)
+  })
 
   describe("create", () => {
     it("should create a new datasource", async () => {
@@ -62,14 +56,7 @@ describe("/datasources", () => {
         datasource: any,
         fields: { path: string; queryString: string }
       ) {
-        return config.previewQuery(
-          request,
-          config,
-          datasource,
-          fields,
-          undefined,
-          ""
-        )
+        return config.previewQuery(request, config, datasource, fields)
       }
 
       it("should invalidate changed or removed variables", async () => {
@@ -104,8 +91,6 @@ describe("/datasources", () => {
   })
 
   describe("fetch", () => {
-    beforeAll(setupTest)
-
     it("returns all the datasources from the server", async () => {
       const res = await request
         .get(`/api/datasources`)
@@ -174,8 +159,6 @@ describe("/datasources", () => {
   })
 
   describe("destroy", () => {
-    beforeAll(setupTest)
-
     it("deletes queries for the datasource after deletion and returns a success message", async () => {
       await config.createQuery()
 

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

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

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

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

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

@@ -10,7 +10,7 @@ describe("/layouts", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
     layout = await config.createLayout()
     jest.clearAllMocks()

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

@@ -9,7 +9,7 @@ describe("/metadata", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
     automation = await config.createAutomation()
   })

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

@@ -7,7 +7,7 @@ describe("run misc tests", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
   })
 

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

@@ -15,11 +15,8 @@ describe("/permission", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
-    await config.init()
-  })
-  
   beforeEach(async () => {
+    await config.init()
     table = await config.createTable()
     row = await config.createRow()
     perms = await config.addPermission(STD_ROLE_ID, table._id)

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

@@ -1,6 +1,3 @@
-const tk = require( "timekeeper")
-tk.freeze(Date.now())
-
 // Mock out postgres for this
 jest.mock("pg")
 jest.mock("node-fetch")
@@ -30,15 +27,10 @@ describe("/queries", () => {
 
   afterAll(setup.afterAll)
 
-  const setupTest = async()=>{
-
+  beforeEach(async () => {
     await config.init()
     datasource = await config.createDatasource()
     query = await config.createQuery()
-  }
-
-  beforeAll(async () => {
-    await setupTest()
   })
 
   async function createInvalidIntegration() {
@@ -109,10 +101,6 @@ describe("/queries", () => {
   })
 
   describe("fetch", () => {
-    beforeEach(async() => {
-      await setupTest()
-    })
-
     it("returns all the queries from the server", async () => {
       const res = await request
         .get(`/api/queries`)
@@ -190,10 +178,6 @@ 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}`)
@@ -242,7 +226,6 @@ describe("/queries", () => {
       })
       expect(res.body.rows.length).toEqual(1)
       expect(events.query.previewed).toBeCalledTimes(1)
-      delete datasource.config
       expect(events.query.previewed).toBeCalledWith(datasource, query)
     })
 
@@ -256,10 +239,6 @@ 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)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
   })
 
@@ -60,11 +60,6 @@ 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)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
     screen = basicScreen()
     screen.routing.route = route

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

@@ -1,8 +1,3 @@
-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
@@ -25,11 +20,8 @@ describe("/rows", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
-  })
-
-  beforeEach(async()=>{
     table = await config.createTable()
     row = basicRow(table._id)
   })
@@ -119,8 +111,8 @@ describe("/rows", () => {
         _id: existing._id,
         _rev: existing._rev,
         type: "row",
-        createdAt: timestamp,
-        updatedAt: timestamp,
+        createdAt: "2020-01-01T00:00:00.000Z",
+        updatedAt: "2020-01-01T00:00:00.000Z",
       })
       await assertQueryUsage(queryUsage + 1)
     })

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

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

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

@@ -8,11 +8,22 @@ describe("/static", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
-    config.modeSelf()
+  beforeEach(async () => {
     app = await config.init()
   })
 
+  describe("/builder", () => {
+    it("should serve the builder", async () => {
+      const res = await request
+        .get("/builder/portal")
+        .set(config.defaultHeaders())
+        .expect("Content-Type", /text\/html/)
+        .expect(200)
+
+      expect(res.text).toContain("<title>Budibase</title>")
+    })
+  })
+
   describe("/app", () => {
     beforeEach(() => {
       jest.clearAllMocks()

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

@@ -10,7 +10,7 @@ describe("/tables", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(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)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
   })
 

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,14 +19,14 @@ describe("/users", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     await config.init()
   })
 
   describe("fetch", () => {
     it("returns a list of users from an instance db", async () => {
-      await config.createUser({ id: "uuidx" })
-      await config.createUser({ id: "uuidy" })
+      await config.createUser("uuidx")
+      await config.createUser("uuidy")
       const res = await request
         .get(`/api/users/metadata`)
         .set(config.defaultHeaders())
@@ -55,7 +53,7 @@ describe("/users", () => {
 
   describe("update", () => {
     it("should be able to update the user", async () => {
-      const user = await config.createUser({ id: `us_update${Math.random()}` })
+      const user = await config.createUser()
       user.roleId = BUILTIN_ROLE_IDS.BASIC
       const res = await request
         .put(`/api/users/metadata`)
@@ -179,11 +177,14 @@ describe("/users", () => {
       const app1 = await config.createApp('App 1')
       const app2 = await config.createApp('App 2')
 
-      let user = await config.createUser({
-        builder: false,
-        admin: true,
-      roles: { [app1.appId]: 'ADMIN' }
-    })
+      let user = await config.createUser(
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        false,
+        true,
+        { [app1.appId]: 'ADMIN' })
       let res = await request
         .post(`/api/users/metadata/sync/${user._id}`)
         .set(config.defaultHeaders())

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) {