Clean up tests

.changeset/two-donuts-sparkle.md

@@ -0,0 +1,9 @@
+---
+"zemble-plugin-auth": patch
+"zemble-plugin-bull": patch
+"zemble-plugin-cms-users": patch
+"zemble-plugin-cms": patch
+"@zemble/graphql": patch
+---
+
+Update readme

packages/auth/graphql/Query/advancedWithOr.test.ts

@@ -14,7 +14,12 @@ describe('advancedWithOr', () => {
   it('Should fail authentication', async () => {
     const app = await plugin.testApp()
 
-    const response = await app.gqlRequest(AdvancedWithOrQuery, { organisationId: '123' })
+    const response = await app.gqlRequest(
+      AdvancedWithOrQuery,
+      { organisationId: '123' },
+      { silenceErrors: true },
+    )
+
     expect(response.errors?.[0].message).toEqual(`Accessing 'Query.advancedWithOr' requires authentication.`)
   })
 
@@ -27,6 +32,7 @@ describe('advancedWithOr', () => {
       headers: {
         Authorization: `Bearer ${token}`,
       },
+      silenceErrors: true,
     })
 
     expect(response.errors?.[0].message).toEqual(`Accessing 'Query.advancedWithOr' requires token including arrays matching one of [{"includes":{"roles":{"role":"admin","organisationId":"123"}}},{"includes":{"roles":{"role":"superadmin","organisationId":"123"}}}].`)
@@ -41,6 +47,7 @@ describe('advancedWithOr', () => {
       headers: {
         Authorization: `Bearer ${token}`,
       },
+      silenceErrors: true,
     })
 
     expect(response.errors?.[0].message).toEqual(`Accessing 'Query.advancedWithOr' requires token including arrays matching one of [{"includes":{"roles":{"role":"admin","organisationId":"123"}}},{"includes":{"roles":{"role":"superadmin","organisationId":"123"}}}].`)
@@ -111,6 +118,7 @@ describe('advancedWithOr', () => {
       headers: {
         Authorization: `Bearer ${token}`,
       },
+      silenceErrors: true,
     })
 
     expect(response.errors?.[0].message).toEqual(`Accessing 'Query.advancedWithOr' requires token including arrays matching one of [{"includes":{"roles":{"role":"admin","organisationId":"123"}}},{"includes":{"roles":{"role":"superadmin","organisationId":"123"}}}].`)

packages/auth/graphql/Query/includes.test.ts

@@ -14,7 +14,11 @@ describe('Includes', () => {
   it('Should fail authentication', async () => {
     const app = await plugin.testApp()
 
-    const response = await app.gqlRequest(IncludesQuery, { id: '1' })
+    const response = await app.gqlRequest(
+      IncludesQuery,
+      { id: '1' },
+      { silenceErrors: true },
+    )
     expect(response.errors?.[0].message).toEqual(`Accessing 'Query.includes' requires authentication.`)
   })
 
@@ -27,6 +31,7 @@ describe('Includes', () => {
       headers: {
         Authorization: `Bearer ${token}`,
       },
+      silenceErrors: true,
     })
     expect(response.errors?.[0].message).toEqual(`Accessing 'Query.includes' requires token including arrays matching {"roles":{"role":"admin","organisationId":"1"}}.`)
   })
@@ -40,6 +45,7 @@ describe('Includes', () => {
       headers: {
         Authorization: `Bearer ${token}`,
       },
+      silenceErrors: true,
     })
     expect(response.errors?.[0].message).toEqual(`Accessing 'Query.includes' requires token including arrays matching {"roles":{"role":"admin","organisationId":"1"}}.`)
   })

packages/auth/graphql/Query/privateShit.test.ts

@@ -12,18 +12,14 @@ const PrivateShitQuery = graphql(`
 
 describe('privateShit', () => {
   it('Should fail authentication', async () => {
-    console.log('test')
     const app = await plugin.testApp()
-    console.log('test2')
 
-    const response = await app.gqlRequest(PrivateShitQuery, {})
+    const response = await app.gqlRequest(PrivateShitQuery, {}, { silenceErrors: true })
     expect(response.errors?.[0].message).toEqual(`Accessing 'Query.privateShit' requires authentication.`)
   })
 
   it('Should succeed authentication', async () => {
-    console.log('test')
     const app = await plugin.testApp()
-    console.log('test2')
 
     const token = await signJwt({ data: { } })
 

packages/auth/graphql/Query/privateShitWithRole.test.ts

@@ -14,7 +14,11 @@ describe('PrivateShitWithRole', () => {
   it('Should fail authentication', async () => {
     const app = await plugin.testApp()
 
-    const response = await app.gqlRequest(PrivateShitWithRoleQuery, {})
+    const response = await app.gqlRequest(
+      PrivateShitWithRoleQuery,
+      {},
+      { silenceErrors: true },
+    )
     expect(response.errors?.[0].message).toEqual(`Accessing 'Query.privateShitWithRole' requires authentication.`)
   })
 
@@ -27,6 +31,7 @@ describe('PrivateShitWithRole', () => {
       headers: {
         Authorization: `Bearer ${token}`,
       },
+      silenceErrors: true,
     })
     expect(response.errors?.[0].message).toEqual(`Accessing 'Query.privateShitWithRole' requires token matching {"role":"admin"}.`)
   })

packages/auth/graphql/Query/variableReference.test.ts

@@ -14,7 +14,11 @@ describe('variableReference', () => {
   it('Should fail authentication', async () => {
     const app = await plugin.testApp()
 
-    const response = await app.gqlRequest(VariableReferenceQuery, { id: '1' })
+    const response = await app.gqlRequest(
+      VariableReferenceQuery,
+      { id: '1' },
+      { silenceErrors: true },
+    )
     expect(response.errors?.[0].message).toEqual(`Accessing 'Query.variableReference' requires authentication.`)
   })
 
@@ -27,6 +31,7 @@ describe('variableReference', () => {
       headers: {
         Authorization: `Bearer ${token}`,
       },
+      silenceErrors: true,
     })
     expect(response.errors?.[0].message).toEqual(`Accessing 'Query.variableReference' requires token matching {"role":"admin","organisationId":"1"}.`)
   })
@@ -40,6 +45,7 @@ describe('variableReference', () => {
       headers: {
         Authorization: `Bearer ${token}`,
       },
+      silenceErrors: true,
     })
     expect(response.errors?.[0].message).toEqual(`Accessing 'Query.variableReference' requires token matching {"role":"admin","organisationId":"1"}.`)
   })

packages/cms-users/graphql/Mutation/updatePermissions.test.ts

@@ -32,7 +32,11 @@ describe('Mutation.updatePermissions', () => {
   it('Should fail without permission', async () => {
     const app = await plugin.testApp()
 
-    const { errors } = await app.gqlRequest(UpdatePermissionsMutation, { userId: 'abc', permissions: [{ type: PermissionType.MODIFY_ENTITY, scope: '*' }] })
+    const { errors } = await app.gqlRequest(
+      UpdatePermissionsMutation,
+      { userId: 'abc', permissions: [{ type: PermissionType.MODIFY_ENTITY, scope: '*' }] },
+      { silenceErrors: true },
+    )
 
     expect(errors?.[0].message).toEqual(`Accessing 'Mutation.updatePermissions' requires authentication.`)
   })
@@ -84,6 +88,7 @@ describe('Mutation.updatePermissions', () => {
       headers: {
         Authorization: `Bearer ${token}`,
       },
+      silenceErrors: true,
     })
 
     expect(errors?.[0].message).toEqual('User not found')
@@ -108,6 +113,7 @@ describe('Mutation.updatePermissions', () => {
       headers: {
         Authorization: `Bearer ${token}`,
       },
+      silenceErrors: true,
     })
 
     expect(errors?.[0].message).toEqual('You cannot remove your own user-admin permission')

packages/cms-users/package.json

@@ -5,7 +5,7 @@
   "main": "plugin.ts",
   "private": true,
   "scripts": {
-    "test": "MONGOMS_DEBUG=1 bun test",
+    "test": "bun test",
     "dev": "MONGO_URL=mongodb://localhost:27017/test-db REDIS_URL=redis://localhost:6379 PLUGIN_DEV=true bun --hot plugin.ts",
     "lint": "eslint .",
     "lint-quiet": "eslint . --quiet",

packages/graphql-yoga/middleware.ts

@@ -40,7 +40,7 @@ async function gqlRequestUntyped<TRes, TVars>(
   app: Zemble.Server,
   query: string,
   variables: TVars,
-  options?: {readonly headers?: Record<string, string>},
+  options?: {readonly headers?: Record<string, string>, readonly silenceErrors?: boolean},
 ) {
   const res = await app.fetch(new Request('http://localhost/graphql', {
     method: 'POST',
@@ -59,7 +59,7 @@ async function gqlRequestUntyped<TRes, TVars>(
     readonly errors: readonly GraphQLFormattedError[]
   }
 
-  if (resJson.errors) {
+  if (resJson.errors && !options?.silenceErrors) {
     console.error(resJson.errors)
   }
 
@@ -70,7 +70,7 @@ async function gqlRequest<TQuery, TVars>(
   app: Zemble.Server,
   query: TypedDocumentNode<TQuery, TVars>,
   variables: TVars,
-  options: {readonly headers?: Record<string, string>} = {},
+  options: {readonly headers?: Record<string, string>, readonly silenceErrors?: boolean} = {},
 ) {
   const req = new Request('http://localhost/graphql', {
     method: 'POST',
@@ -91,7 +91,7 @@ async function gqlRequest<TQuery, TVars>(
     readonly errors: readonly GraphQLFormattedError[]
   }
 
-  if (resJson.errors) {
+  if (resJson.errors && !options?.silenceErrors) {
     console.error(resJson.errors)
   }
 

packages/graphql-yoga/plugin.ts

@@ -18,7 +18,7 @@ declare global {
       readonly gqlRequest: <TQuery, TVars>(
         query: TypedDocumentNode<TQuery, TVars>,
         vars?: TVars,
-        opts?: {readonly headers?: Record<string, string>}
+        opts?: {readonly headers?: Record<string, string>, readonly silenceErrors?: boolean}
       ) => Promise<{
         readonly data?: ResultOf<TypedDocumentNode<TQuery, TVars>>,
         readonly errors?: readonly GraphQLFormattedError[]
@@ -27,7 +27,7 @@ declare global {
       readonly gqlRequestUntyped: <TRes, TVars = unknown>(
         query: string,
         vars?: TVars,
-        opts?: {readonly headers?: Record<string, string>}
+        opts?: {readonly headers?: Record<string, string>, readonly silenceErrors?: boolean}
       ) => Promise<{
         readonly data?: TRes,
         readonly errors?: readonly GraphQLFormattedError[]