Mocking and test improvements

kingstinct · Oct 16, 2023 · 070c553 · 070c553
1 parent 0eb9124
commit 070c553
Show file tree

Hide file tree

Showing 38 changed files with 217 additions and 50 deletions.
diff --git a/apps/supplement-stack/CHANGELOG.md b/apps/supplement-stack/CHANGELOG.md
@@ -1,5 +1,17 @@
 # supplement-stack
 
+## 0.0.7
+
+### Patch Changes
+
+- Updated dependencies
+  - [email protected]
+  - @zemble/core@0.0.7
+  - @zemble/graphql@0.0.11
+  - [email protected]
+  - [email protected]
+  - [email protected]
+
 ## 0.0.6
 
 ### Patch Changes

diff --git a/apps/supplement-stack/package.json b/apps/supplement-stack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "supplement-stack",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "",
   "main": "app.ts",
   "private": true,

diff --git a/apps/todo-app-with-auth-backend/CHANGELOG.md b/apps/todo-app-with-auth-backend/CHANGELOG.md
@@ -1,5 +1,17 @@
 # todo-app-with-auth-backend
 
+## 0.0.7
+
+### Patch Changes
+
+- Updated dependencies
+  - [email protected]
+  - @zemble/core@0.0.7
+  - @zemble/graphql@0.0.11
+  - [email protected]
+  - [email protected]
+  - [email protected]
+
 ## 0.0.6
 
 ### Patch Changes

diff --git a/apps/todo-app-with-auth-backend/package.json b/apps/todo-app-with-auth-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "todo-app-with-auth-backend",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "",
   "private": true,
   "main": "app.ts",

diff --git a/packages/apple-app-site-association/CHANGELOG.md b/packages/apple-app-site-association/CHANGELOG.md
@@ -1,5 +1,12 @@
 # zemble-plugin-apple-app-site-association
 
+## 0.0.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @zemble/core@0.0.7
+
 ## 0.0.4
 
 ### Patch Changes

diff --git a/packages/apple-app-site-association/package.json b/packages/apple-app-site-association/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zemble-plugin-apple-app-site-association",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "",
   "private": true,
   "main": "plugin.ts",

diff --git a/packages/auth-anonymous/CHANGELOG.md b/packages/auth-anonymous/CHANGELOG.md
@@ -1,5 +1,14 @@
 # zemble-plugin-auth-anonymous
 
+## 0.0.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @zemble/core@0.0.7
+  - @zemble/graphql@0.0.11
+  - [email protected]
+
 ## 0.0.6
 
 ### Patch Changes

diff --git a/packages/auth-anonymous/package.json b/packages/auth-anonymous/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zemble-plugin-auth-anonymous",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "",
   "main": "plugin.ts",
   "scripts": {

diff --git a/packages/auth-api-token/CHANGELOG.md b/packages/auth-api-token/CHANGELOG.md
@@ -1,5 +1,14 @@
 # zemble-plugin-auth-api-token
 
+## 0.0.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @zemble/core@0.0.7
+  - @zemble/graphql@0.0.11
+  - [email protected]
+
 ## 0.0.8
 
 ### Patch Changes

diff --git a/packages/auth-api-token/package.json b/packages/auth-api-token/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zemble-plugin-auth-api-token",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "",
   "main": "plugin.ts",
   "scripts": {

diff --git a/packages/auth-otp/CHANGELOG.md b/packages/auth-otp/CHANGELOG.md
@@ -1,5 +1,15 @@
 # zemble-plugin-auth-otp
 
+## 0.0.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @zemble/core@0.0.7
+  - @zemble/graphql@0.0.11
+  - [email protected]
+  - [email protected]
+
 ## 0.0.8
 
 ### Patch Changes

diff --git a/packages/auth-otp/package.json b/packages/auth-otp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zemble-plugin-auth-otp",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "",
   "main": "plugin.ts",
   "scripts": {

diff --git a/packages/auth-otp/plugin.ts b/packages/auth-otp/plugin.ts
@@ -69,7 +69,7 @@ const defaultConfig = {
   minTimeBetweenTwoFactorCodeRequestsInSeconds: 60 * 1, // 1 minute
   generateTokenContents,
   handleAuthRequest: async (to, twoFactorCode, { sendEmail, logger }) => {
-    if (sendEmail) {
+    if (sendEmail && process.env.NODE_ENV !== 'test') {
       void sendEmail({
         from: plugin.config.from,
         subject: plugin.config.emailSubject ? simpleTemplating(plugin.config.emailSubject, { email: to.email, name: to.name ?? to.email, twoFactorCode }) : 'Login',

diff --git a/packages/auth/CHANGELOG.md b/packages/auth/CHANGELOG.md
@@ -1,5 +1,13 @@
 # zemble-plugin-auth
 
+## 0.0.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @zemble/core@0.0.7
+  - @zemble/graphql@0.0.11
+
 ## 0.0.8
 
 ### Patch Changes

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zemble-plugin-auth",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "",
   "main": "plugin.ts",
   "bin": {

diff --git a/packages/bull/CHANGELOG.md b/packages/bull/CHANGELOG.md
@@ -1,5 +1,15 @@
 # zemble-plugin-bull
 
+## 0.0.9
+
+### Patch Changes
+
+- Mocking and test improvements
+- Updated dependencies
+  - @zemble/core@0.0.7
+  - @zemble/graphql@0.0.11
+  - [email protected]
+
 ## 0.0.8
 
 ### Patch Changes

diff --git a/packages/bull/ZembleQueue.ts b/packages/bull/ZembleQueue.ts
@@ -1,8 +1,16 @@
 import { ZembleQueueBull } from './ZembleQueueBull'
-import ZembleQueueMock from './ZembleQueueMock'
 
 export type { ZembleQueueConfig } from './ZembleQueueBull'
 
-export const ZembleQueue = process.env.NODE_ENV === 'test' ? ZembleQueueMock : ZembleQueueBull
+// eslint-disable-next-line import/no-mutable-exports
+let ZembleQueue = ZembleQueueBull
+
+if (process.env.NODE_ENV === 'test') {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  ZembleQueue = (require('./ZembleQueueMock').default)
+}
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+export { ZembleQueue }
 
 export default ZembleQueue
diff --git a/packages/bull/package.json b/packages/bull/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zemble-plugin-bull",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "",
   "main": "plugin.ts",
   "scripts": {

diff --git a/packages/bull/utils/setupQueues.ts b/packages/bull/utils/setupQueues.ts
@@ -8,7 +8,6 @@ import '@zemble/graphql'
 import createClient from '../clients/redis'
 import { type BullPluginConfig } from '../plugin'
 import ZembleQueueBull from '../ZembleQueueBull'
-import ZembleQueueMock from '../ZembleQueueMock'
 
 import type {
   Queue,
@@ -72,7 +71,8 @@ const setupQueues = (pluginPath: string, pubSub: Zemble.PubSubType, config: Bull
 
           // eslint-disable-next-line functional/immutable-data
           queues.push(queue)
-        } else if (queueConfig instanceof ZembleQueueMock) {
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        } else if (process.env.NODE_ENV === 'test' && queueConfig instanceof require('./ZembleQueueMock').default) {
           await queueConfig._initQueue(fileNameWithoutExtension)
         } else {
           throw new Error(`Failed to load queue ${filename}, make sure it exports a ZembleQueue`)

diff --git a/packages/cms-users/CHANGELOG.md b/packages/cms-users/CHANGELOG.md
@@ -1,5 +1,17 @@
 # zemble-plugin-cms-users
 
+## 0.0.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @zemble/core@0.0.7
+  - @zemble/graphql@0.0.11
+  - [email protected]
+  - [email protected]
+  - [email protected]
+  - [email protected]
+
 ## 0.0.6
 
 ### Patch Changes

diff --git a/packages/cms-users/package.json b/packages/cms-users/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zemble-plugin-cms-users",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "",
   "main": "plugin.ts",
   "private": true,

diff --git a/packages/cms/CHANGELOG.md b/packages/cms/CHANGELOG.md
@@ -1,5 +1,14 @@
 # zemble-plugin-cms
 
+## 0.0.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @zemble/core@0.0.7
+  - @zemble/graphql@0.0.11
+  - [email protected]
+
 ## 0.0.6
 
 ### Patch Changes

diff --git a/packages/cms/package.json b/packages/cms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zemble-plugin-cms",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "",
   "main": "plugin.ts",
   "private": true,

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @zemble/core
 
+## 0.0.7
+
+### Patch Changes
+
+- Mocking and test improvements
+
 ## 0.0.6
 
 ### Patch Changes

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zemble/core",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "",
   "main": "index.ts",
   "scripts": {

diff --git a/packages/core/utils/readPackageJson.ts b/packages/core/utils/readPackageJson.ts
@@ -1,9 +1,9 @@
 import fs from 'fs'
 import { join } from 'node:path'
 
-export const readPackageJson = (path = process.cwd()): { readonly name: string, readonly version: string } => {
+export const readPackageJson = (path = process.cwd()) => {
   try {
-    const packageJson = JSON.parse(fs.readFileSync(join(path, 'package.json'), 'utf8'))
+    const packageJson = JSON.parse(fs.readFileSync(join(path, 'package.json'), 'utf8')) as { readonly name: string, readonly version: string }
 
     if (!packageJson.name) {
       throw new Error(`[@zemble] Invalid package.json, missing "name", looked in: ${packageJson.name}`)

diff --git a/packages/email-sendgrid/CHANGELOG.md b/packages/email-sendgrid/CHANGELOG.md
@@ -1,5 +1,15 @@
 # zemble-plugin-email-sendgrid
 
+## 0.0.9
+
+### Patch Changes
+
+- Mocking and test improvements
+- Updated dependencies
+  - @zemble/core@0.0.7
+  - @zemble/graphql@0.0.11
+  - [email protected]
+
 ## 0.0.8
 
 ### Patch Changes

diff --git a/packages/email-sendgrid/package.json b/packages/email-sendgrid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zemble-plugin-email-sendgrid",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "",
   "main": "plugin.ts",
   "scripts": {