@budibase/worker 2.22.3 → 2.22.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.22.3",
+  "version": "2.22.4",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -37,10 +37,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.22.3",
-    "@budibase/pro": "2.22.3",
-    "@budibase/string-templates": "2.22.3",
-    "@budibase/types": "2.22.3",
+    "@budibase/backend-core": "2.22.4",
+    "@budibase/pro": "2.22.4",
+    "@budibase/string-templates": "2.22.4",
+    "@budibase/types": "2.22.4",
     "@koa/router": "8.0.8",
     "@techpass/passport-openidconnect": "0.3.2",
     "@types/global-agent": "2.1.1",
@@ -108,5 +108,5 @@
       }
     }
   },
-  "gitHead": "32b6d3bf3eec3ac42d428c543669d62a35e9ad62"
+  "gitHead": "be7e99f7fdb36262e4a90563edad1ed53ec4e55e"
 }

package/src/api/routes/global/tests/auth.spec.ts

@@ -58,7 +58,7 @@ describe("/api/global/auth", () => {
         const response = await config.api.auth.login(tenantId, email, password)
 
         expectSetAuthCookie(response)
-        expect(events.auth.login).toBeCalledTimes(1)
+        expect(events.auth.login).toHaveBeenCalledTimes(1)
       })
 
       it("should return 403 with incorrect credentials", async () => {
@@ -139,7 +139,7 @@ describe("/api/global/auth", () => {
     describe("POST /api/global/auth/logout", () => {
       it("should logout", async () => {
         const response = await config.api.auth.logout()
-        expect(events.auth.logout).toBeCalledTimes(1)
+        expect(events.auth.logout).toHaveBeenCalledTimes(1)
 
         const authCookie = getAuthCookie(response)
         expect(authCookie).toBe("")
@@ -160,8 +160,8 @@ describe("/api/global/auth", () => {
         })
         expect(sendMailMock).toHaveBeenCalled()
         expect(code).toBeDefined()
-        expect(events.user.passwordResetRequested).toBeCalledTimes(1)
-        expect(events.user.passwordResetRequested).toBeCalledWith(user)
+        expect(events.user.passwordResetRequested).toHaveBeenCalledTimes(1)
+        expect(events.user.passwordResetRequested).toHaveBeenCalledWith(user)
       })
 
       describe("sso user", () => {
@@ -211,8 +211,8 @@ describe("/api/global/auth", () => {
         delete user.password
 
         expect(res.body).toEqual({ message: "password reset successfully." })
-        expect(events.user.passwordReset).toBeCalledTimes(1)
-        expect(events.user.passwordReset).toBeCalledWith(user)
+        expect(events.user.passwordReset).toHaveBeenCalledTimes(1)
+        expect(events.user.passwordReset).toHaveBeenCalledWith(user)
 
         // login using new password
         await config.api.auth.login(user.tenantId, user.email, newPassword)
@@ -360,21 +360,16 @@ describe("/api/global/auth", () => {
 
         const res = await config.api.configs.OIDCCallback(configId, preAuthRes)
 
-        expect(events.auth.login).toBeCalledWith("oidc", "oauth@example.com")
-        expect(events.auth.login).toBeCalledTimes(1)
+        expect(events.auth.login).toHaveBeenCalledWith(
+          "oidc",
+          "oauth@example.com"
+        )
+        expect(events.auth.login).toHaveBeenCalledTimes(1)
         expect(res.status).toBe(302)
         const location: string = res.get("location")
         expect(location).toBe("/")
         expectSetAuthCookie(res)
       })
     })
-
-    // SINGLE TENANT
-
-    describe("GET /api/global/auth/oidc/callback", () => {})
-
-    describe("GET /api/global/auth/oidc/callback", () => {})
-
-    describe("GET /api/admin/auth/oidc/callback", () => {})
   })
 })

package/src/api/routes/global/tests/configs.spec.ts

@@ -57,20 +57,22 @@ describe("configs", () => {
       describe("create", () => {
         it("should create activated google config", async () => {
           await saveGoogleConfig()
-          expect(events.auth.SSOCreated).toBeCalledTimes(1)
-          expect(events.auth.SSOCreated).toBeCalledWith(ConfigType.GOOGLE)
-          expect(events.auth.SSODeactivated).not.toBeCalled()
-          expect(events.auth.SSOActivated).toBeCalledTimes(1)
-          expect(events.auth.SSOActivated).toBeCalledWith(ConfigType.GOOGLE)
+          expect(events.auth.SSOCreated).toHaveBeenCalledTimes(1)
+          expect(events.auth.SSOCreated).toHaveBeenCalledWith(ConfigType.GOOGLE)
+          expect(events.auth.SSODeactivated).not.toHaveBeenCalled()
+          expect(events.auth.SSOActivated).toHaveBeenCalledTimes(1)
+          expect(events.auth.SSOActivated).toHaveBeenCalledWith(
+            ConfigType.GOOGLE
+          )
           await config.deleteConfig(ConfigType.GOOGLE)
         })
 
         it("should create deactivated google config", async () => {
           await saveGoogleConfig({ activated: false })
-          expect(events.auth.SSOCreated).toBeCalledTimes(1)
-          expect(events.auth.SSOCreated).toBeCalledWith(ConfigType.GOOGLE)
-          expect(events.auth.SSOActivated).not.toBeCalled()
-          expect(events.auth.SSODeactivated).not.toBeCalled()
+          expect(events.auth.SSOCreated).toHaveBeenCalledTimes(1)
+          expect(events.auth.SSOCreated).toHaveBeenCalledWith(ConfigType.GOOGLE)
+          expect(events.auth.SSOActivated).not.toHaveBeenCalled()
+          expect(events.auth.SSODeactivated).not.toHaveBeenCalled()
           await config.deleteConfig(ConfigType.GOOGLE)
         })
       })
@@ -84,11 +86,13 @@ describe("configs", () => {
             googleConf._id,
             googleConf._rev
           )
-          expect(events.auth.SSOUpdated).toBeCalledTimes(1)
-          expect(events.auth.SSOUpdated).toBeCalledWith(ConfigType.GOOGLE)
-          expect(events.auth.SSOActivated).not.toBeCalled()
-          expect(events.auth.SSODeactivated).toBeCalledTimes(1)
-          expect(events.auth.SSODeactivated).toBeCalledWith(ConfigType.GOOGLE)
+          expect(events.auth.SSOUpdated).toHaveBeenCalledTimes(1)
+          expect(events.auth.SSOUpdated).toHaveBeenCalledWith(ConfigType.GOOGLE)
+          expect(events.auth.SSOActivated).not.toHaveBeenCalled()
+          expect(events.auth.SSODeactivated).toHaveBeenCalledTimes(1)
+          expect(events.auth.SSODeactivated).toHaveBeenCalledWith(
+            ConfigType.GOOGLE
+          )
           await config.deleteConfig(ConfigType.GOOGLE)
         })
 
@@ -100,11 +104,13 @@ describe("configs", () => {
             googleConf._id,
             googleConf._rev
           )
-          expect(events.auth.SSOUpdated).toBeCalledTimes(1)
-          expect(events.auth.SSOUpdated).toBeCalledWith(ConfigType.GOOGLE)
-          expect(events.auth.SSODeactivated).not.toBeCalled()
-          expect(events.auth.SSOActivated).toBeCalledTimes(1)
-          expect(events.auth.SSOActivated).toBeCalledWith(ConfigType.GOOGLE)
+          expect(events.auth.SSOUpdated).toHaveBeenCalledTimes(1)
+          expect(events.auth.SSOUpdated).toHaveBeenCalledWith(ConfigType.GOOGLE)
+          expect(events.auth.SSODeactivated).not.toHaveBeenCalled()
+          expect(events.auth.SSOActivated).toHaveBeenCalledTimes(1)
+          expect(events.auth.SSOActivated).toHaveBeenCalledWith(
+            ConfigType.GOOGLE
+          )
           await config.deleteConfig(ConfigType.GOOGLE)
         })
       })
@@ -123,20 +129,20 @@ describe("configs", () => {
       describe("create", () => {
         it("should create activated OIDC config", async () => {
           await saveOIDCConfig()
-          expect(events.auth.SSOCreated).toBeCalledTimes(1)
-          expect(events.auth.SSOCreated).toBeCalledWith(ConfigType.OIDC)
-          expect(events.auth.SSODeactivated).not.toBeCalled()
-          expect(events.auth.SSOActivated).toBeCalledTimes(1)
-          expect(events.auth.SSOActivated).toBeCalledWith(ConfigType.OIDC)
+          expect(events.auth.SSOCreated).toHaveBeenCalledTimes(1)
+          expect(events.auth.SSOCreated).toHaveBeenCalledWith(ConfigType.OIDC)
+          expect(events.auth.SSODeactivated).not.toHaveBeenCalled()
+          expect(events.auth.SSOActivated).toHaveBeenCalledTimes(1)
+          expect(events.auth.SSOActivated).toHaveBeenCalledWith(ConfigType.OIDC)
           await config.deleteConfig(ConfigType.OIDC)
         })
 
         it("should create deactivated OIDC config", async () => {
           await saveOIDCConfig({ activated: false })
-          expect(events.auth.SSOCreated).toBeCalledTimes(1)
-          expect(events.auth.SSOCreated).toBeCalledWith(ConfigType.OIDC)
-          expect(events.auth.SSOActivated).not.toBeCalled()
-          expect(events.auth.SSODeactivated).not.toBeCalled()
+          expect(events.auth.SSOCreated).toHaveBeenCalledTimes(1)
+          expect(events.auth.SSOCreated).toHaveBeenCalledWith(ConfigType.OIDC)
+          expect(events.auth.SSOActivated).not.toHaveBeenCalled()
+          expect(events.auth.SSODeactivated).not.toHaveBeenCalled()
           await config.deleteConfig(ConfigType.OIDC)
         })
       })
@@ -150,11 +156,13 @@ describe("configs", () => {
             oidcConf._id,
             oidcConf._rev
           )
-          expect(events.auth.SSOUpdated).toBeCalledTimes(1)
-          expect(events.auth.SSOUpdated).toBeCalledWith(ConfigType.OIDC)
-          expect(events.auth.SSOActivated).not.toBeCalled()
-          expect(events.auth.SSODeactivated).toBeCalledTimes(1)
-          expect(events.auth.SSODeactivated).toBeCalledWith(ConfigType.OIDC)
+          expect(events.auth.SSOUpdated).toHaveBeenCalledTimes(1)
+          expect(events.auth.SSOUpdated).toHaveBeenCalledWith(ConfigType.OIDC)
+          expect(events.auth.SSOActivated).not.toHaveBeenCalled()
+          expect(events.auth.SSODeactivated).toHaveBeenCalledTimes(1)
+          expect(events.auth.SSODeactivated).toHaveBeenCalledWith(
+            ConfigType.OIDC
+          )
           await config.deleteConfig(ConfigType.OIDC)
         })
 
@@ -166,11 +174,11 @@ describe("configs", () => {
             oidcConf._id,
             oidcConf._rev
           )
-          expect(events.auth.SSOUpdated).toBeCalledTimes(1)
-          expect(events.auth.SSOUpdated).toBeCalledWith(ConfigType.OIDC)
-          expect(events.auth.SSODeactivated).not.toBeCalled()
-          expect(events.auth.SSOActivated).toBeCalledTimes(1)
-          expect(events.auth.SSOActivated).toBeCalledWith(ConfigType.OIDC)
+          expect(events.auth.SSOUpdated).toHaveBeenCalledTimes(1)
+          expect(events.auth.SSOUpdated).toHaveBeenCalledWith(ConfigType.OIDC)
+          expect(events.auth.SSODeactivated).not.toHaveBeenCalled()
+          expect(events.auth.SSOActivated).toHaveBeenCalledTimes(1)
+          expect(events.auth.SSOActivated).toHaveBeenCalledWith(ConfigType.OIDC)
           await config.deleteConfig(ConfigType.OIDC)
         })
       })
@@ -190,8 +198,8 @@ describe("configs", () => {
         it("should create SMTP config", async () => {
           await config.deleteConfig(ConfigType.SMTP)
           await saveSMTPConfig()
-          expect(events.email.SMTPUpdated).not.toBeCalled()
-          expect(events.email.SMTPCreated).toBeCalledTimes(1)
+          expect(events.email.SMTPUpdated).not.toHaveBeenCalled()
+          expect(events.email.SMTPCreated).toHaveBeenCalledTimes(1)
           await config.deleteConfig(ConfigType.SMTP)
         })
       })
@@ -201,8 +209,8 @@ describe("configs", () => {
           const smtpConf = await saveSMTPConfig()
           jest.clearAllMocks()
           await saveSMTPConfig(smtpConf.config, smtpConf._id, smtpConf._rev)
-          expect(events.email.SMTPCreated).not.toBeCalled()
-          expect(events.email.SMTPUpdated).toBeCalledTimes(1)
+          expect(events.email.SMTPCreated).not.toHaveBeenCalled()
+          expect(events.email.SMTPUpdated).toHaveBeenCalledTimes(1)
           await config.deleteConfig(ConfigType.SMTP)
         })
       })
@@ -215,9 +223,9 @@ describe("configs", () => {
 
           await saveSettingsConfig()
 
-          expect(events.org.nameUpdated).not.toBeCalled()
-          expect(events.org.logoUpdated).not.toBeCalled()
-          expect(events.org.platformURLUpdated).not.toBeCalled()
+          expect(events.org.nameUpdated).not.toHaveBeenCalled()
+          expect(events.org.logoUpdated).not.toHaveBeenCalled()
+          expect(events.org.platformURLUpdated).not.toHaveBeenCalled()
         })
 
         it("should create settings config with non-default settings", async () => {
@@ -231,9 +239,9 @@ describe("configs", () => {
 
           await saveSettingsConfig(conf)
 
-          expect(events.org.nameUpdated).toBeCalledTimes(1)
-          expect(events.org.logoUpdated).toBeCalledTimes(1)
-          expect(events.org.platformURLUpdated).toBeCalledTimes(1)
+          expect(events.org.nameUpdated).toHaveBeenCalledTimes(1)
+          expect(events.org.logoUpdated).toHaveBeenCalledTimes(1)
+          expect(events.org.platformURLUpdated).toHaveBeenCalledTimes(1)
           config.cloudHosted()
         })
       })
@@ -253,9 +261,9 @@ describe("configs", () => {
             settingsConfig._rev
           )
 
-          expect(events.org.nameUpdated).toBeCalledTimes(1)
-          expect(events.org.logoUpdated).toBeCalledTimes(1)
-          expect(events.org.platformURLUpdated).toBeCalledTimes(1)
+          expect(events.org.nameUpdated).toHaveBeenCalledTimes(1)
+          expect(events.org.logoUpdated).toHaveBeenCalledTimes(1)
+          expect(events.org.platformURLUpdated).toHaveBeenCalledTimes(1)
           config.cloudHosted()
         })
       })

package/src/api/routes/global/tests/groups.spec.ts

@@ -25,9 +25,9 @@ describe("/api/global/groups", () => {
     it("should be able to create a new group", async () => {
       const group = structures.groups.UserGroup()
       await config.api.groups.saveGroup(group)
-      expect(events.group.created).toBeCalledTimes(1)
-      expect(events.group.updated).not.toBeCalled()
-      expect(events.group.permissionsEdited).not.toBeCalled()
+      expect(events.group.created).toHaveBeenCalledTimes(1)
+      expect(events.group.updated).not.toHaveBeenCalled()
+      expect(events.group.permissionsEdited).not.toHaveBeenCalled()
     })
 
     it("should not allow undefined names", async () => {
@@ -57,7 +57,7 @@ describe("/api/global/groups", () => {
     it("should trim names", async () => {
       const group = { ...structures.groups.UserGroup(), name: "   group name " }
       await config.api.groups.saveGroup(group)
-      expect(events.group.created).toBeCalledWith(
+      expect(events.group.created).toHaveBeenCalledWith(
         expect.objectContaining({ name: "group name" })
       )
     })
@@ -100,8 +100,8 @@ describe("/api/global/groups", () => {
       }
       await config.api.groups.saveGroup(updatedGroup)
 
-      expect(events.group.updated).toBeCalledTimes(1)
-      expect(events.group.permissionsEdited).not.toBeCalled()
+      expect(events.group.updated).toHaveBeenCalledTimes(1)
+      expect(events.group.permissionsEdited).not.toHaveBeenCalled()
     })
 
     describe("scim", () => {
@@ -135,7 +135,7 @@ describe("/api/global/groups", () => {
           },
         })
 
-        expect(events.group.updated).not.toBeCalled()
+        expect(events.group.updated).not.toHaveBeenCalled()
       })
 
       it("update will not amend the SCIM fields", async () => {
@@ -151,7 +151,7 @@ describe("/api/global/groups", () => {
           expect: 200,
         })
 
-        expect(events.group.updated).toBeCalledTimes(1)
+        expect(events.group.updated).toHaveBeenCalledTimes(1)
         expect(
           (
             await config.api.groups.find(group._id!, {
@@ -176,7 +176,7 @@ describe("/api/global/groups", () => {
       let oldGroup = await config.api.groups.saveGroup(group)
       await config.api.groups.deleteGroup(oldGroup.body._id, oldGroup.body._rev)
 
-      expect(events.group.deleted).toBeCalledTimes(1)
+      expect(events.group.deleted).toHaveBeenCalledTimes(1)
     })
   })
 

package/src/api/routes/global/tests/license.spec.ts

@@ -22,7 +22,7 @@ describe("/api/global/license", () => {
     it("returns 200", async () => {
       const res = await config.api.license.refresh()
       expect(res.status).toBe(200)
-      expect(licensing.cache.refresh).toBeCalledTimes(1)
+      expect(licensing.cache.refresh).toHaveBeenCalledTimes(1)
     })
   })
 
@@ -42,7 +42,9 @@ describe("/api/global/license", () => {
         licenseKey: "licenseKey",
       })
       expect(res.status).toBe(200)
-      expect(licensing.keys.activateLicenseKey).toBeCalledWith("licenseKey")
+      expect(licensing.keys.activateLicenseKey).toHaveBeenCalledWith(
+        "licenseKey"
+      )
     })
   })
 
@@ -64,7 +66,7 @@ describe("/api/global/license", () => {
   describe("DELETE /api/global/license/key", () => {
     it("returns 204", async () => {
       const res = await config.api.license.deleteLicenseKey()
-      expect(licensing.keys.deleteLicenseKey).toBeCalledTimes(1)
+      expect(licensing.keys.deleteLicenseKey).toHaveBeenCalledTimes(1)
       expect(res.status).toBe(204)
     })
   })
@@ -74,9 +76,9 @@ describe("/api/global/license", () => {
       const res = await config.api.license.activateOfflineLicense({
         offlineLicenseToken: "offlineLicenseToken",
       })
-      expect(licensing.offline.activateOfflineLicenseToken).toBeCalledWith(
-        "offlineLicenseToken"
-      )
+      expect(
+        licensing.offline.activateOfflineLicenseToken
+      ).toHaveBeenCalledWith("offlineLicenseToken")
       expect(res.status).toBe(200)
     })
   })
@@ -102,7 +104,9 @@ describe("/api/global/license", () => {
     it("returns 204", async () => {
       const res = await config.api.license.deleteOfflineLicense()
       expect(res.status).toBe(204)
-      expect(licensing.offline.deleteOfflineLicenseToken).toBeCalledTimes(1)
+      expect(licensing.offline.deleteOfflineLicenseToken).toHaveBeenCalledTimes(
+        1
+      )
     })
   })
 

package/src/api/routes/global/tests/realEmail.spec.ts

@@ -43,7 +43,6 @@ describe("/api/global/email", () => {
       }
       expect(res.body.message).toBeDefined()
       const testUrl = nodemailer.getTestMessageUrl(res.body)
-      console.log(`${purpose} URL: ${testUrl}`)
       expect(testUrl).toBeDefined()
       response = await fetch(testUrl)
       text = await response.text()

package/src/api/routes/global/tests/scim.spec.ts

@@ -304,7 +304,7 @@ describe("scim", () => {
 
           await postScimUser({ body })
 
-          expect(events.user.created).toBeCalledTimes(1)
+          expect(events.user.created).toHaveBeenCalledTimes(1)
         })
 
         it("if the username is an email, the user name will be used as email", async () => {
@@ -571,7 +571,7 @@ describe("scim", () => {
 
         await patchScimUser({ id: user.id, body })
 
-        expect(events.user.updated).toBeCalledTimes(1)
+        expect(events.user.updated).toHaveBeenCalledTimes(1)
       })
     })
 
@@ -603,7 +603,7 @@ describe("scim", () => {
       it("an event is dispatched", async () => {
         await deleteScimUser(user.id, { expect: 204 })
 
-        expect(events.user.deleted).toBeCalledTimes(1)
+        expect(events.user.deleted).toHaveBeenCalledTimes(1)
       })
 
       it("an account holder cannot be removed even when synched", async () => {

package/src/api/routes/global/tests/self.spec.ts

@@ -41,10 +41,10 @@ describe("/api/global/self", () => {
       user._rev = dbUser._rev
       user.dayPassRecordedAt = mocks.date.MOCK_DATE.toISOString()
       expect(res.body._id).toBe(user._id)
-      expect(events.user.updated).toBeCalledTimes(1)
-      expect(events.user.updated).toBeCalledWith(dbUser)
-      expect(events.user.passwordUpdated).toBeCalledTimes(1)
-      expect(events.user.passwordUpdated).toBeCalledWith(dbUser)
+      expect(events.user.updated).toHaveBeenCalledTimes(1)
+      expect(events.user.updated).toHaveBeenCalledWith(dbUser)
+      expect(events.user.passwordUpdated).toHaveBeenCalledTimes(1)
+      expect(events.user.passwordUpdated).toHaveBeenCalledWith(dbUser)
     })
   })
 

package/src/api/routes/global/tests/users.spec.ts

@@ -39,7 +39,7 @@ describe("/api/global/users", () => {
 
       expect(sendMailMock).toHaveBeenCalled()
       expect(code).toBeDefined()
-      expect(events.user.invited).toBeCalledTimes(1)
+      expect(events.user.invited).toHaveBeenCalledTimes(1)
     })
 
     it("should not be able to generate an invitation for existing user", async () => {
@@ -52,7 +52,7 @@ describe("/api/global/users", () => {
       expect(res.body.message).toBe(`Unavailable`)
       expect(sendMailMock).toHaveBeenCalledTimes(0)
       expect(code).toBeUndefined()
-      expect(events.user.invited).toBeCalledTimes(0)
+      expect(events.user.invited).toHaveBeenCalledTimes(0)
     })
 
     it("should not invite the same user twice", async () => {
@@ -70,7 +70,7 @@ describe("/api/global/users", () => {
       expect(res.body.message).toBe(`Unavailable`)
       expect(sendMailMock).toHaveBeenCalledTimes(0)
       expect(code).toBeUndefined()
-      expect(events.user.invited).toBeCalledTimes(0)
+      expect(events.user.invited).toHaveBeenCalledTimes(0)
     })
 
     it("should be able to create new user from invite", async () => {
@@ -86,8 +86,8 @@ describe("/api/global/users", () => {
       const user = await config.getUser(email)
       expect(user).toBeDefined()
       expect(user!._id).toEqual(res.body._id)
-      expect(events.user.inviteAccepted).toBeCalledTimes(1)
-      expect(events.user.inviteAccepted).toBeCalledWith(user)
+      expect(events.user.inviteAccepted).toHaveBeenCalledTimes(1)
+      expect(events.user.inviteAccepted).toHaveBeenCalledWith(user)
     })
   })
 
@@ -105,7 +105,7 @@ describe("/api/global/users", () => {
       expect(body.successful.length).toBe(2)
       expect(body.unsuccessful.length).toBe(0)
       expect(sendMailMock).toHaveBeenCalledTimes(2)
-      expect(events.user.invited).toBeCalledTimes(2)
+      expect(events.user.invited).toHaveBeenCalledTimes(2)
     })
 
     it("should not be able to generate an invitation for existing user", async () => {
@@ -118,7 +118,7 @@ describe("/api/global/users", () => {
       expect(body.unsuccessful.length).toBe(1)
       expect(body.unsuccessful[0].reason).toBe("Unavailable")
       expect(sendMailMock).toHaveBeenCalledTimes(0)
-      expect(events.user.invited).toBeCalledTimes(0)
+      expect(events.user.invited).toHaveBeenCalledTimes(0)
     })
 
     it("should not be able to generate an invitation for user that has already been invited", async () => {
@@ -135,7 +135,7 @@ describe("/api/global/users", () => {
       expect(body.unsuccessful.length).toBe(1)
       expect(body.unsuccessful[0].reason).toBe("Unavailable")
       expect(sendMailMock).toHaveBeenCalledTimes(0)
-      expect(events.user.invited).toBeCalledTimes(0)
+      expect(events.user.invited).toHaveBeenCalledTimes(0)
     })
   })
 
@@ -149,7 +149,7 @@ describe("/api/global/users", () => {
       expect(response.created?.successful.length).toBe(0)
       expect(response.created?.unsuccessful.length).toBe(1)
       expect(response.created?.unsuccessful[0].email).toBe(user.email)
-      expect(events.user.created).toBeCalledTimes(0)
+      expect(events.user.created).toHaveBeenCalledTimes(0)
     })
 
     it("should ignore users existing in other tenants", async () => {
@@ -162,7 +162,7 @@ describe("/api/global/users", () => {
         expect(response.created?.successful.length).toBe(0)
         expect(response.created?.unsuccessful.length).toBe(1)
         expect(response.created?.unsuccessful[0].email).toBe(user.email)
-        expect(events.user.created).toBeCalledTimes(0)
+        expect(events.user.created).toHaveBeenCalledTimes(0)
       })
     })
 
@@ -177,7 +177,7 @@ describe("/api/global/users", () => {
       expect(response.created?.successful.length).toBe(0)
       expect(response.created?.unsuccessful.length).toBe(1)
       expect(response.created?.unsuccessful[0].email).toBe(user.email)
-      expect(events.user.created).toBeCalledTimes(0)
+      expect(events.user.created).toHaveBeenCalledTimes(0)
     })
 
     it("should be able to bulk create users", async () => {
@@ -196,9 +196,9 @@ describe("/api/global/users", () => {
       expect(response.created?.successful[1].email).toBe(admin.email)
       expect(response.created?.successful[2].email).toBe(user.email)
       expect(response.created?.unsuccessful.length).toBe(0)
-      expect(events.user.created).toBeCalledTimes(3)
-      expect(events.user.permissionAdminAssigned).toBeCalledTimes(1)
-      expect(events.user.permissionBuilderAssigned).toBeCalledTimes(2)
+      expect(events.user.created).toHaveBeenCalledTimes(3)
+      expect(events.user.permissionAdminAssigned).toHaveBeenCalledTimes(1)
+      expect(events.user.permissionBuilderAssigned).toHaveBeenCalledTimes(2)
     })
   })
 
@@ -208,10 +208,10 @@ describe("/api/global/users", () => {
 
       await config.api.users.saveUser(user)
 
-      expect(events.user.created).toBeCalledTimes(1)
-      expect(events.user.updated).not.toBeCalled()
-      expect(events.user.permissionBuilderAssigned).not.toBeCalled()
-      expect(events.user.permissionAdminAssigned).not.toBeCalled()
+      expect(events.user.created).toHaveBeenCalledTimes(1)
+      expect(events.user.updated).not.toHaveBeenCalled()
+      expect(events.user.permissionBuilderAssigned).not.toHaveBeenCalled()
+      expect(events.user.permissionAdminAssigned).not.toHaveBeenCalled()
     })
 
     it("should be able to create an admin user", async () => {
@@ -219,10 +219,10 @@ describe("/api/global/users", () => {
 
       await config.api.users.saveUser(user)
 
-      expect(events.user.created).toBeCalledTimes(1)
-      expect(events.user.updated).not.toBeCalled()
-      expect(events.user.permissionBuilderAssigned).toBeCalledTimes(1)
-      expect(events.user.permissionAdminAssigned).toBeCalledTimes(1)
+      expect(events.user.created).toHaveBeenCalledTimes(1)
+      expect(events.user.updated).not.toHaveBeenCalled()
+      expect(events.user.permissionBuilderAssigned).toHaveBeenCalledTimes(1)
+      expect(events.user.permissionAdminAssigned).toHaveBeenCalledTimes(1)
     })
 
     it("should be able to create a builder user", async () => {
@@ -230,10 +230,10 @@ describe("/api/global/users", () => {
 
       await config.api.users.saveUser(user)
 
-      expect(events.user.created).toBeCalledTimes(1)
-      expect(events.user.updated).not.toBeCalled()
-      expect(events.user.permissionBuilderAssigned).toBeCalledTimes(1)
-      expect(events.user.permissionAdminAssigned).not.toBeCalled()
+      expect(events.user.created).toHaveBeenCalledTimes(1)
+      expect(events.user.updated).not.toHaveBeenCalled()
+      expect(events.user.permissionBuilderAssigned).toHaveBeenCalledTimes(1)
+      expect(events.user.permissionAdminAssigned).not.toHaveBeenCalled()
     })
 
     it("should be able to assign app roles", async () => {
@@ -246,11 +246,11 @@ describe("/api/global/users", () => {
       await config.api.users.saveUser(user)
 
       const savedUser = await config.getUser(user.email)
-      expect(events.user.created).toBeCalledTimes(1)
-      expect(events.user.updated).not.toBeCalled()
-      expect(events.role.assigned).toBeCalledTimes(2)
-      expect(events.role.assigned).toBeCalledWith(savedUser, "role1")
-      expect(events.role.assigned).toBeCalledWith(savedUser, "role2")
+      expect(events.user.created).toHaveBeenCalledTimes(1)
+      expect(events.user.updated).not.toHaveBeenCalled()
+      expect(events.role.assigned).toHaveBeenCalledTimes(2)
+      expect(events.role.assigned).toHaveBeenCalledWith(savedUser, "role1")
+      expect(events.role.assigned).toHaveBeenCalledWith(savedUser, "role2")
     })
 
     it("should not be able to create user that exists in same tenant", async () => {
@@ -264,7 +264,7 @@ describe("/api/global/users", () => {
       expect(response.body.message).toBe(
         `Email already in use: '${user.email}'`
       )
-      expect(events.user.created).toBeCalledTimes(0)
+      expect(events.user.created).toHaveBeenCalledTimes(0)
     })
 
     it("should not be able to create user that exists in other tenant", async () => {
@@ -278,7 +278,7 @@ describe("/api/global/users", () => {
         expect(response.body.message).toBe(
           `Email already in use: '${user.email}'`
         )
-        expect(events.user.created).toBeCalledTimes(0)
+        expect(events.user.created).toHaveBeenCalledTimes(0)
       })
     })
 
@@ -292,7 +292,7 @@ describe("/api/global/users", () => {
       expect(response.body.message).toBe(
         `Email already in use: '${user.email}'`
       )
-      expect(events.user.created).toBeCalledTimes(0)
+      expect(events.user.created).toHaveBeenCalledTimes(0)
     })
 
     it("should not be able to create a user with the same email and different casing", async () => {
@@ -302,7 +302,7 @@ describe("/api/global/users", () => {
       user.email = user.email.toUpperCase()
       await config.api.users.saveUser(user, 400)
 
-      expect(events.user.created).toBeCalledTimes(1)
+      expect(events.user.created).toHaveBeenCalledTimes(1)
     })
 
     it("should not be able to bulk create a user with the same email and different casing", async () => {
@@ -312,7 +312,7 @@ describe("/api/global/users", () => {
       user.email = user.email.toUpperCase()
       await config.api.users.bulkCreateUsers([user])
 
-      expect(events.user.created).toBeCalledTimes(1)
+      expect(events.user.created).toHaveBeenCalledTimes(1)
     })
 
     it("should not allow a non-admin user to create a new user", async () => {
@@ -335,11 +335,11 @@ describe("/api/global/users", () => {
 
       await config.api.users.saveUser(user)
 
-      expect(events.user.created).not.toBeCalled()
-      expect(events.user.updated).toBeCalledTimes(1)
-      expect(events.user.permissionBuilderAssigned).not.toBeCalled()
-      expect(events.user.permissionAdminAssigned).not.toBeCalled()
-      expect(events.user.passwordForceReset).not.toBeCalled()
+      expect(events.user.created).not.toHaveBeenCalled()
+      expect(events.user.updated).toHaveBeenCalledTimes(1)
+      expect(events.user.permissionBuilderAssigned).not.toHaveBeenCalled()
+      expect(events.user.permissionAdminAssigned).not.toHaveBeenCalled()
+      expect(events.user.passwordForceReset).not.toHaveBeenCalled()
     })
 
     it("should not allow a user to update their own admin/builder status", async () => {
@@ -367,11 +367,11 @@ describe("/api/global/users", () => {
       user.password = "tempPassword"
       await config.api.users.saveUser(user)
 
-      expect(events.user.created).not.toBeCalled()
-      expect(events.user.updated).toBeCalledTimes(1)
-      expect(events.user.permissionBuilderAssigned).not.toBeCalled()
-      expect(events.user.permissionAdminAssigned).not.toBeCalled()
-      expect(events.user.passwordForceReset).toBeCalledTimes(1)
+      expect(events.user.created).not.toHaveBeenCalled()
+      expect(events.user.updated).toHaveBeenCalledTimes(1)
+      expect(events.user.permissionBuilderAssigned).not.toHaveBeenCalled()
+      expect(events.user.permissionAdminAssigned).not.toHaveBeenCalled()
+      expect(events.user.passwordForceReset).toHaveBeenCalledTimes(1)
     })
 
     it("should be able to update a basic user to an admin user", async () => {
@@ -380,10 +380,10 @@ describe("/api/global/users", () => {
 
       await config.api.users.saveUser(structures.users.adminUser(user))
 
-      expect(events.user.created).not.toBeCalled()
-      expect(events.user.updated).toBeCalledTimes(1)
-      expect(events.user.permissionBuilderAssigned).toBeCalledTimes(1)
-      expect(events.user.permissionAdminAssigned).toBeCalledTimes(1)
+      expect(events.user.created).not.toHaveBeenCalled()
+      expect(events.user.updated).toHaveBeenCalledTimes(1)
+      expect(events.user.permissionBuilderAssigned).toHaveBeenCalledTimes(1)
+      expect(events.user.permissionAdminAssigned).toHaveBeenCalledTimes(1)
     })
 
     it("should be able to update a basic user to a builder user", async () => {
@@ -392,10 +392,10 @@ describe("/api/global/users", () => {
 
       await config.api.users.saveUser(structures.users.builderUser(user))
 
-      expect(events.user.created).not.toBeCalled()
-      expect(events.user.updated).toBeCalledTimes(1)
-      expect(events.user.permissionBuilderAssigned).toBeCalledTimes(1)
-      expect(events.user.permissionAdminAssigned).not.toBeCalled()
+      expect(events.user.created).not.toHaveBeenCalled()
+      expect(events.user.updated).toHaveBeenCalledTimes(1)
+      expect(events.user.permissionBuilderAssigned).toHaveBeenCalledTimes(1)
+      expect(events.user.permissionAdminAssigned).not.toHaveBeenCalled()
     })
 
     it("should be able to update an admin user to a basic user", async () => {
@@ -406,10 +406,10 @@ describe("/api/global/users", () => {
 
       await config.api.users.saveUser(user)
 
-      expect(events.user.created).not.toBeCalled()
-      expect(events.user.updated).toBeCalledTimes(1)
-      expect(events.user.permissionAdminRemoved).toBeCalledTimes(1)
-      expect(events.user.permissionBuilderRemoved).toBeCalledTimes(1)
+      expect(events.user.created).not.toHaveBeenCalled()
+      expect(events.user.updated).toHaveBeenCalledTimes(1)
+      expect(events.user.permissionAdminRemoved).toHaveBeenCalledTimes(1)
+      expect(events.user.permissionBuilderRemoved).toHaveBeenCalledTimes(1)
     })
 
     it("should be able to update an builder user to a basic user", async () => {
@@ -419,10 +419,10 @@ describe("/api/global/users", () => {
 
       await config.api.users.saveUser(user)
 
-      expect(events.user.created).not.toBeCalled()
-      expect(events.user.updated).toBeCalledTimes(1)
-      expect(events.user.permissionBuilderRemoved).toBeCalledTimes(1)
-      expect(events.user.permissionAdminRemoved).not.toBeCalled()
+      expect(events.user.created).not.toHaveBeenCalled()
+      expect(events.user.updated).toHaveBeenCalledTimes(1)
+      expect(events.user.permissionBuilderRemoved).toHaveBeenCalledTimes(1)
+      expect(events.user.permissionAdminRemoved).not.toHaveBeenCalled()
     })
 
     it("should be able to assign app roles", async () => {
@@ -436,11 +436,11 @@ describe("/api/global/users", () => {
       await config.api.users.saveUser(user)
 
       const savedUser = await config.getUser(user.email)
-      expect(events.user.created).not.toBeCalled()
-      expect(events.user.updated).toBeCalledTimes(1)
-      expect(events.role.assigned).toBeCalledTimes(2)
-      expect(events.role.assigned).toBeCalledWith(savedUser, "role1")
-      expect(events.role.assigned).toBeCalledWith(savedUser, "role2")
+      expect(events.user.created).not.toHaveBeenCalled()
+      expect(events.user.updated).toHaveBeenCalledTimes(1)
+      expect(events.role.assigned).toHaveBeenCalledTimes(2)
+      expect(events.role.assigned).toHaveBeenCalledWith(savedUser, "role1")
+      expect(events.role.assigned).toHaveBeenCalledWith(savedUser, "role2")
     })
 
     it("should be able to unassign app roles", async () => {
@@ -456,11 +456,11 @@ describe("/api/global/users", () => {
       await config.api.users.saveUser(user)
 
       const savedUser = await config.getUser(user.email)
-      expect(events.user.created).not.toBeCalled()
-      expect(events.user.updated).toBeCalledTimes(1)
-      expect(events.role.unassigned).toBeCalledTimes(2)
-      expect(events.role.unassigned).toBeCalledWith(savedUser, "role1")
-      expect(events.role.unassigned).toBeCalledWith(savedUser, "role2")
+      expect(events.user.created).not.toHaveBeenCalled()
+      expect(events.user.updated).toHaveBeenCalledTimes(1)
+      expect(events.role.unassigned).toHaveBeenCalledTimes(2)
+      expect(events.role.unassigned).toHaveBeenCalledWith(savedUser, "role1")
+      expect(events.role.unassigned).toHaveBeenCalledWith(savedUser, "role2")
     })
 
     it("should be able to update existing app roles", async () => {
@@ -479,12 +479,12 @@ describe("/api/global/users", () => {
       await config.api.users.saveUser(user)
 
       const savedUser = await config.getUser(user.email)
-      expect(events.user.created).not.toBeCalled()
-      expect(events.user.updated).toBeCalledTimes(1)
-      expect(events.role.unassigned).toBeCalledTimes(1)
-      expect(events.role.unassigned).toBeCalledWith(savedUser, "role2")
-      expect(events.role.assigned).toBeCalledTimes(1)
-      expect(events.role.assigned).toBeCalledWith(savedUser, "role2-edit")
+      expect(events.user.created).not.toHaveBeenCalled()
+      expect(events.user.updated).toHaveBeenCalledTimes(1)
+      expect(events.role.unassigned).toHaveBeenCalledTimes(1)
+      expect(events.role.unassigned).toHaveBeenCalledWith(savedUser, "role2")
+      expect(events.role.assigned).toHaveBeenCalledTimes(1)
+      expect(events.role.assigned).toHaveBeenCalledWith(savedUser, "role2-edit")
     })
 
     it("should not be able to update email address", async () => {
@@ -534,7 +534,7 @@ describe("/api/global/users", () => {
       const response = await config.api.users.bulkDeleteUsers([user._id!], 400)
 
       expect(response.message).toBe("Unable to delete self.")
-      expect(events.user.deleted).not.toBeCalled()
+      expect(events.user.deleted).not.toHaveBeenCalled()
     })
 
     it("should not be able to bulk delete account owner", async () => {
@@ -551,7 +551,7 @@ describe("/api/global/users", () => {
         "Account holder cannot be deleted"
       )
       expect(response.deleted?.unsuccessful[0]._id).toBe(user._id)
-      expect(events.user.deleted).not.toBeCalled()
+      expect(events.user.deleted).not.toHaveBeenCalled()
     })
 
     it("should be able to bulk delete users", async () => {
@@ -574,9 +574,9 @@ describe("/api/global/users", () => {
 
       expect(response.deleted?.successful.length).toBe(3)
       expect(response.deleted?.unsuccessful.length).toBe(0)
-      expect(events.user.deleted).toBeCalledTimes(3)
-      expect(events.user.permissionAdminRemoved).toBeCalledTimes(1)
-      expect(events.user.permissionBuilderRemoved).toBeCalledTimes(2)
+      expect(events.user.deleted).toHaveBeenCalledTimes(3)
+      expect(events.user.permissionAdminRemoved).toHaveBeenCalledTimes(1)
+      expect(events.user.permissionBuilderRemoved).toHaveBeenCalledTimes(2)
     })
   })
 
@@ -669,9 +669,9 @@ describe("/api/global/users", () => {
 
       await config.api.users.deleteUser(user._id!)
 
-      expect(events.user.deleted).toBeCalledTimes(1)
-      expect(events.user.permissionBuilderRemoved).not.toBeCalled()
-      expect(events.user.permissionAdminRemoved).not.toBeCalled()
+      expect(events.user.deleted).toHaveBeenCalledTimes(1)
+      expect(events.user.permissionBuilderRemoved).not.toHaveBeenCalled()
+      expect(events.user.permissionAdminRemoved).not.toHaveBeenCalled()
     })
 
     it("should be able to destroy an admin user", async () => {
@@ -680,9 +680,9 @@ describe("/api/global/users", () => {
 
       await config.api.users.deleteUser(user._id!)
 
-      expect(events.user.deleted).toBeCalledTimes(1)
-      expect(events.user.permissionBuilderRemoved).toBeCalledTimes(1)
-      expect(events.user.permissionAdminRemoved).toBeCalledTimes(1)
+      expect(events.user.deleted).toHaveBeenCalledTimes(1)
+      expect(events.user.permissionBuilderRemoved).toHaveBeenCalledTimes(1)
+      expect(events.user.permissionAdminRemoved).toHaveBeenCalledTimes(1)
     })
 
     it("should be able to destroy a builder user", async () => {
@@ -691,9 +691,9 @@ describe("/api/global/users", () => {
 
       await config.api.users.deleteUser(user._id!)
 
-      expect(events.user.deleted).toBeCalledTimes(1)
-      expect(events.user.permissionBuilderRemoved).toBeCalledTimes(1)
-      expect(events.user.permissionAdminRemoved).not.toBeCalled()
+      expect(events.user.deleted).toHaveBeenCalledTimes(1)
+      expect(events.user.permissionBuilderRemoved).toHaveBeenCalledTimes(1)
+      expect(events.user.permissionAdminRemoved).not.toHaveBeenCalled()
     })
 
     it("should not be able to destroy account owner", async () => {

package/src/api/routes/system/tests/migrations.spec.ts

@@ -31,13 +31,13 @@ describe("/api/system/migrations", () => {
         status: 403,
       })
       expect(res.body).toEqual({ message: "Unauthorized", status: 403 })
-      expect(migrateFn).toBeCalledTimes(0)
+      expect(migrateFn).toHaveBeenCalledTimes(0)
     })
 
     it("runs migrations", async () => {
       const res = await config.api.migrations.runMigrations()
       expect(res.text).toBe("OK")
-      expect(migrateFn).toBeCalledTimes(1)
+      expect(migrateFn).toHaveBeenCalledTimes(1)
     })
   })
 

package/src/api/routes/system/tests/status.spec.ts

@@ -28,7 +28,7 @@ describe("/api/system/status", () => {
           passing: true,
         },
       })
-      expect(accounts.getStatus).toBeCalledTimes(0)
+      expect(accounts.getStatus).toHaveBeenCalledTimes(0)
       config.cloudHosted()
     })
 
@@ -45,7 +45,7 @@ describe("/api/system/status", () => {
 
       const res = await config.api.status.getStatus()
 
-      expect(accounts.getStatus).toBeCalledTimes(1)
+      expect(accounts.getStatus).toHaveBeenCalledTimes(1)
       expect(res.body).toEqual(value)
     })
   })

package/src/api/routes/global/tests/workspaces.spec.ts

@@ -1,29 +0,0 @@
-import { TestConfiguration } from "../../../../tests"
-
-// TODO
-
-describe("/api/global/workspaces", () => {
-  const config = new TestConfiguration()
-
-  beforeAll(async () => {
-    await config.beforeAll()
-  })
-
-  afterAll(async () => {
-    await config.afterAll()
-  })
-
-  afterEach(() => {
-    jest.clearAllMocks()
-  })
-
-  describe("GET /api/global/workspaces", () => {
-    it("retrieves workspaces", () => {})
-  })
-
-  describe("DELETE /api/global/workspaces/:id", () => {})
-
-  describe("GET /api/global/workspaces", () => {})
-
-  describe("GET /api/global/workspaces/:id", () => {})
-})