@budibase/worker 2.3.14-alpha.0 → 2.3.15

package/src/tests/TestConfiguration.ts

@@ -20,44 +20,22 @@ import {
   auth,
   constants,
   env as coreEnv,
-  DEFAULT_TENANT_ID,
 } from "@budibase/backend-core"
-import structures, { TENANT_ID, CSRF_TOKEN } from "./structures"
+import structures, { TENANT_ID, TENANT_1, CSRF_TOKEN } from "./structures"
 import { CreateUserResponse, User, AuthToken } from "@budibase/types"
 import API from "./api"
-import sdk from "../sdk"
 
 enum Mode {
   CLOUD = "cloud",
   SELF = "self",
 }
 
-async function retry<T extends (...arg0: any[]) => any>(
-  fn: T,
-  maxTry: number = 5,
-  retryCount = 1
-): Promise<Awaited<ReturnType<T>>> {
-  const currRetry = typeof retryCount === "number" ? retryCount : 1
-  try {
-    const result = await fn()
-    return result
-  } catch (e) {
-    console.log(`Retry ${currRetry} failed.`)
-    if (currRetry > maxTry) {
-      console.log(`All ${maxTry} retry attempts exhausted`)
-      throw e
-    }
-    return retry(fn, maxTry, currRetry + 1)
-  }
-}
-
 class TestConfiguration {
   server: any
   request: any
   api: API
   defaultUser?: User
   tenant1User?: User
-  #tenantId?: string
 
   constructor(
     opts: { openServer: boolean; mode: Mode } = {
@@ -134,21 +112,13 @@ class TestConfiguration {
   // SETUP / TEARDOWN
 
   async beforeAll() {
-    try {
-      this.#tenantId = structures.tenant.id()
+    await this.createDefaultUser()
+    await this.createSession(this.defaultUser!)
 
-      // Running tests in parallel causes issues creating the globaldb twice. This ensures the db is properly created before starting
-      await retry(async () => await this.createDefaultUser())
-      await this.createSession(this.defaultUser!)
-
-      await tenancy.doInTenant(this.#tenantId, async () => {
-        await this.createTenant1User()
-        await this.createSession(this.tenant1User!)
-      })
-    } catch (e: any) {
-      console.log(e)
-      throw new Error(e.message)
-    }
+    await tenancy.doInTenant(TENANT_1, async () => {
+      await this.createTenant1User()
+      await this.createSession(this.tenant1User!)
+    })
   }
 
   async afterAll() {
@@ -163,8 +133,6 @@ class TestConfiguration {
     // create user / new tenant
     const res = await this.api.users.createAdminUser()
 
-    await sdk.users.addTenant(res.tenantId, res.userId, res.email)
-
     // return the created user
     const userRes = await this.api.users.getUser(res.userId, {
       headers: {
@@ -184,7 +152,7 @@ class TestConfiguration {
     try {
       return tenancy.getTenantId()
     } catch (e: any) {
-      return DEFAULT_TENANT_ID
+      return TENANT_ID
     }
   }
 
@@ -235,7 +203,7 @@ class TestConfiguration {
     const tenantId = this.getTenantId()
     if (tenantId === TENANT_ID) {
       return this.authHeaders(this.defaultUser!)
-    } else if (tenantId === this.getTenantId()) {
+    } else if (tenantId === TENANT_1) {
       return this.authHeaders(this.tenant1User!)
     } else {
       throw new Error("could not determine auth headers to use")
@@ -254,6 +222,7 @@ class TestConfiguration {
 
   async createDefaultUser() {
     const user = structures.users.adminUser({
+      email: "test@test.com",
       password: "test",
     })
     this.defaultUser = await this.createUser(user)
@@ -261,6 +230,7 @@ class TestConfiguration {
 
   async createTenant1User() {
     const user = structures.users.adminUser({
+      email: "tenant1@test.com",
       password: "test",
     })
     this.tenant1User = await this.createUser(user)

package/src/tests/api/auth.ts

@@ -1,4 +1,3 @@
-import structures from "../structures"
 import TestConfiguration from "../TestConfiguration"
 import { TestAPI } from "./base"
 
@@ -25,17 +24,14 @@ export class AuthAPI extends TestAPI {
       .expect(200)
   }
 
-  requestPasswordReset = async (sendMailMock: any, userEmail: string) => {
+  requestPasswordReset = async (sendMailMock: any) => {
     await this.config.saveSmtpConfig()
     await this.config.saveSettingsConfig()
-    await this.config.createUser({
-      ...structures.users.user(),
-      email: userEmail,
-    })
+    await this.config.createUser()
     const res = await this.request
       .post(`/api/global/auth/${this.config.getTenantId()}/reset`)
       .send({
-        email: userEmail,
+        email: "test@test.com",
       })
       .expect("Content-Type", /json/)
       .expect(200)

package/src/tests/api/configs.ts

@@ -10,8 +10,8 @@ export class ConfigAPI extends TestAPI {
     return this.request
       .get(`/api/global/configs/checklist`)
       .set(this.config.defaultHeaders())
-      .expect(200)
       .expect("Content-Type", /json/)
+      .expect(200)
   }
 
   saveConfig = (data: any) => {
@@ -19,8 +19,8 @@ export class ConfigAPI extends TestAPI {
       .post(`/api/global/configs`)
       .send(data)
       .set(this.config.defaultHeaders())
-      .expect(200)
       .expect("Content-Type", /json/)
+      .expect(200)
   }
 
   OIDCCallback = (configId: string, preAuthRes: any) => {

package/src/tests/api/users.ts

@@ -26,8 +26,8 @@ export class UserAPI extends TestAPI {
         email,
       })
       .set(this.config.defaultHeaders())
-      .expect(status)
       .expect("Content-Type", /json/)
+      .expect(status)
 
     if (status !== 200) {
       return { code: undefined, res }
@@ -100,7 +100,7 @@ export class UserAPI extends TestAPI {
       request = {
         email: structures.email(),
         password: generator.string(),
-        tenantId: structures.tenant.id(),
+        tenantId: structures.uuid(),
       }
     }
     const res = await this.request

package/src/tests/jestSetup.ts

@@ -1,7 +1,4 @@
-import { mocks, testContainerUtils } from "@budibase/backend-core/tests"
-
-import env from "../environment"
-import { env as coreEnv } from "@budibase/backend-core"
+import { mocks } from "@budibase/backend-core/tests"
 
 // must explicitly enable fetch mock
 mocks.fetch.enable()
@@ -18,9 +15,5 @@ if (!process.env.DEBUG) {
 if (!process.env.CI) {
   // set a longer timeout in dev for debugging
   // 100 seconds
-  jest.setTimeout(100 * 1000)
-} else {
-  jest.setTimeout(10 * 1000)
+  jest.setTimeout(100000)
 }
-
-testContainerUtils.setupEnv(env, coreEnv)

package/src/tests/structures/index.ts

@@ -5,6 +5,7 @@ import * as groups from "./groups"
 import { v4 as uuid } from "uuid"
 
 export const TENANT_ID = "default"
+export const TENANT_1 = "tenant1"
 export const CSRF_TOKEN = "e3727778-7af0-4226-b5eb-f43cbe60a306"
 
 const pkg = {
@@ -13,6 +14,7 @@ const pkg = {
   configs,
   users,
   TENANT_ID,
+  TENANT_1,
   CSRF_TOKEN,
   groups,
 }

package/__mocks__/node-fetch.ts

@@ -1,23 +0,0 @@
-import fs from "fs"
-module FetchMock {
-  const fetch = jest.requireActual("node-fetch")
-
-  const func = async (url: any, opts: any) => {
-    if (url.includes("http://someconfigurl")) {
-      return {
-        ok: true,
-        json: () => ({
-          issuer: "test",
-          authorization_endpoint: "http://localhost/auth",
-          token_endpoint: "http://localhost/token",
-          userinfo_endpoint: "http://localhost/userinfo",
-        }),
-      }
-    }
-    return fetch(url, opts)
-  }
-
-  func.Headers = fetch.Headers
-
-  module.exports = func
-}

package/jest-testcontainers-config.js

@@ -1,8 +0,0 @@
-const { join } = require("path")
-require("dotenv").config({
-  path: join(__dirname, "..", "..", "hosting", ".env"),
-})
-
-const jestTestcontainersConfigGenerator = require("../../jestTestcontainersConfigGenerator")
-
-module.exports = jestTestcontainersConfigGenerator()