chore(backend, auth): verify try-catches in tests (#2782)

* feat: add logging plugin * wip: update graphql schema * chore: update asset resolvers * wip: update autopeering resolvers * feat: further simplify asset resolver * feat: update fee resolvers * fix: autopeering tests * feat: update incoming payments * fix: improve error handling on incoming payment resolver * feat: update outgoing payment resolvers * feat: update peer resolvers * feat: update quote resolvers * feat: update receiver resolvers * feat: update wallet address resolvers * feat: update wallet address key resolvers * feat(wip): backend graphql logs * feat(backend): updated logs for graphql resolvers, remove code & message from resolver responses * update frontend types * chore: formatting * feat: update integration tests * fix: rebase induced test errors * fix: frontend wallet address update * fix: reinstate and fix removed test * fix: change some payment gql error codes * feat: change liquidity response to just return success * fix: bigints, integration query * fix: integration tests * fix: asset test * fix: delete unnecessary code * fix: test for graphqlerror instead of apolloerror * chore: formatting * fix: inspect error object in tests * chore(backend, auth): verify try-catches in tests * chore(backend): fix auto-peering test --------- Co-authored-by: Sabine Schaller <[email protected]> Co-authored-by: Nathan Lie <[email protected]>
interledger · Jun 27, 2024 · 00adfd4 · 00adfd4
1 parent 48a286b
commit 00adfd4
Show file tree

Hide file tree

Showing 14 changed files with 585 additions and 442 deletions.
diff --git a/packages/auth/src/graphql/resolvers/grant.test.ts b/packages/auth/src/graphql/resolvers/grant.test.ts
@@ -483,9 +483,9 @@ describe('Grant Resolvers', (): void => {
     })
 
     test('Returns error for unknown grant', async (): Promise<void> => {
-      let gqlQuery
+      expect.assertions(2)
       try {
-        gqlQuery = appContainer.apolloClient
+        await appContainer.apolloClient
           .mutate({
             mutation: gql`
               query GetGrant($id: ID!) {
@@ -515,8 +515,6 @@ describe('Grant Resolvers', (): void => {
               throw new Error('Data was empty')
             }
           })
-
-        await gqlQuery // throw error to inspect error object
       } catch (error) {
         assert.ok(error instanceof ApolloError)
         expect(error.message).toBe('No grant')
@@ -563,13 +561,13 @@ describe('Grant Resolvers', (): void => {
     })
 
     test('Returns error if grant id is not provided', async (): Promise<void> => {
-      let gqlQuery
+      expect.assertions(2)
       try {
         const input: RevokeGrantInput = {
           grantId: ''
         }
 
-        gqlQuery = appContainer.apolloClient
+        await appContainer.apolloClient
           .mutate({
             mutation: gql`
               mutation revokeGrant($input: RevokeGrantInput!) {
@@ -589,8 +587,6 @@ describe('Grant Resolvers', (): void => {
               throw new Error('Data was empty')
             }
           })
-
-        await gqlQuery // throw error to inspect error object
       } catch (error) {
         assert.ok(error instanceof ApolloError)
         expect(error.message).toBe('Grant id is not provided')
@@ -601,13 +597,13 @@ describe('Grant Resolvers', (): void => {
     })
 
     test('Returns error if id does not exist', async (): Promise<void> => {
-      let gqlQuery
+      expect.assertions(2)
       try {
         const input: RevokeGrantInput = {
           grantId: uuid()
         }
 
-        gqlQuery = appContainer.apolloClient
+        await appContainer.apolloClient
           .mutate({
             mutation: gql`
               mutation revokeGrant($input: RevokeGrantInput!) {
@@ -627,8 +623,6 @@ describe('Grant Resolvers', (): void => {
               throw new Error('Data was empty')
             }
           })
-
-        await gqlQuery // throw error to inspect error object
       } catch (error) {
         assert.ok(error instanceof ApolloError)
         expect(error.message).toBe('Revoke grant was not successful')
@@ -639,13 +633,14 @@ describe('Grant Resolvers', (): void => {
     })
 
     test('Returns error if grant id is in invalid format', async (): Promise<void> => {
-      let gqlQuery
+      expect.assertions(1)
+
       try {
         const input: RevokeGrantInput = {
           grantId: '123'
         }
 
-        gqlQuery = appContainer.apolloClient
+        await appContainer.apolloClient
           .mutate({
             mutation: gql`
               mutation revokeGrant($input: RevokeGrantInput!) {
@@ -665,8 +660,6 @@ describe('Grant Resolvers', (): void => {
               throw new Error('Data was empty')
             }
           })
-
-        await gqlQuery // throw error to inspect error object
       } catch (error) {
         assert.ok(error instanceof ApolloError)
         expect(error.graphQLErrors[0].extensions.code).toEqual(

diff --git a/packages/backend/src/graphql/middleware/index.test.ts b/packages/backend/src/graphql/middleware/index.test.ts
@@ -1,4 +1,4 @@
-import { gql } from '@apollo/client'
+import { ApolloError, gql } from '@apollo/client'
 import assert from 'assert'
 import { v4 as uuid } from 'uuid'
 
@@ -193,16 +193,22 @@ describe('GraphQL Middleware', (): void => {
 
       createAssetSpy.mockClear()
 
-      const repeatResponse = callCreateAssetMutation({
-        ...input,
-        idempotencyKey: uuid()
-      })
-
-      await expect(repeatResponse).rejects.toThrow(
-        new GraphQLError(errorToMessage[AssetError.DuplicateAsset], {
-          extensions: {
+      let error
+      try {
+        await callCreateAssetMutation({
+          ...input,
+          idempotencyKey: uuid()
+        })
+      } catch (err) {
+        error = err
+      }
+      expect(error).toBeInstanceOf(ApolloError)
+      expect((error as ApolloError).graphQLErrors).toContainEqual(
+        expect.objectContaining({
+          message: errorToMessage[AssetError.DuplicateAsset],
+          extensions: expect.objectContaining({
             code: errorToCode[AssetError.DuplicateAsset]
-          }
+          })
         })
       )
       expect(createAssetSpy).toHaveBeenCalledTimes(1)

diff --git a/packages/backend/src/graphql/resolvers/asset.test.ts b/packages/backend/src/graphql/resolvers/asset.test.ts
@@ -131,7 +131,10 @@ describe('Asset Resolvers', (): void => {
 
     test('Returns error for duplicate asset', async (): Promise<void> => {
       const input = randomAsset()
-      await expect(assetService.create(input)).resolves.toMatchObject(input)
+
+      await assetService.create(input)
+
+      expect.assertions(2)
       try {
         await appContainer.apolloClient
           .mutate({
@@ -173,6 +176,7 @@ describe('Asset Resolvers', (): void => {
         .spyOn(assetService, 'create')
         .mockRejectedValueOnce(new Error('unexpected'))
 
+      expect.assertions(2)
       try {
         await appContainer.apolloClient
           .mutate({
@@ -359,6 +363,7 @@ describe('Asset Resolvers', (): void => {
     })
 
     test('Returns error for unknown asset', async (): Promise<void> => {
+      expect.assertions(2)
       try {
         await appContainer.apolloClient
           .query({
@@ -624,6 +629,7 @@ describe('Asset Resolvers', (): void => {
     )
 
     test('Returns error for unknown asset', async (): Promise<void> => {
+      expect.assertions(2)
       try {
         await appContainer.apolloClient
           .mutate({
@@ -703,6 +709,7 @@ describe('Asset Resolvers', (): void => {
     })
 
     test('Returns error for unknown asset', async (): Promise<void> => {
+      expect.assertions(2)
       try {
         await appContainer.apolloClient
           .mutate({
@@ -746,6 +753,7 @@ describe('Asset Resolvers', (): void => {
         throw new Error('unexpected')
       })
 
+      expect.assertions(2)
       try {
         await appContainer.apolloClient
           .mutate({

diff --git a/packages/backend/src/graphql/resolvers/auto-peering.test.ts b/packages/backend/src/graphql/resolvers/auto-peering.test.ts
@@ -240,6 +240,7 @@ describe('Auto Peering Resolvers', (): void => {
         .spyOn(autoPeeringService, 'initiatePeeringRequest')
         .mockResolvedValueOnce(testError)
       const input = createOrUpdatePeerByUrlInput()
+      expect.assertions(2)
       try {
         await appContainer.apolloClient
           .mutate({
@@ -283,6 +284,7 @@ describe('Auto Peering Resolvers', (): void => {
         .spyOn(autoPeeringService, 'initiatePeeringRequest')
         .mockRejectedValueOnce(new Error('unexpected'))
 
+      expect.assertions(2)
       try {
         await appContainer.apolloClient
           .mutate({

diff --git a/packages/backend/src/graphql/resolvers/fee.test.ts b/packages/backend/src/graphql/resolvers/fee.test.ts
@@ -93,6 +93,8 @@ describe('Fee Resolvers', () => {
           basisPoints: 100
         }
       }
+
+      expect.assertions(2)
       try {
         await appContainer.apolloClient
           .mutate({
@@ -141,6 +143,8 @@ describe('Fee Resolvers', () => {
           basisPoints: -10_000
         }
       }
+
+      expect.assertions(2)
       try {
         await appContainer.apolloClient
           .mutate({
@@ -192,6 +196,8 @@ describe('Fee Resolvers', () => {
           basisPoints: -10_000
         }
       }
+
+      expect.assertions(2)
       try {
         await appContainer.apolloClient
           .mutate({

diff --git a/packages/backend/src/graphql/resolvers/incoming_payment.test.ts b/packages/backend/src/graphql/resolvers/incoming_payment.test.ts
@@ -199,6 +199,7 @@ describe('Incoming Payment Resolver', (): void => {
         walletAddressId: uuid()
       }
 
+      expect.assertions(3)
       try {
         await appContainer.apolloClient
           .query({
@@ -231,7 +232,7 @@ describe('Incoming Payment Resolver', (): void => {
           })
         )
       }
-      await expect(createSpy).toHaveBeenCalledWith(input)
+      expect(createSpy).toHaveBeenCalledWith(input)
     })
 
     test('Internal server error', async (): Promise<void> => {
@@ -243,6 +244,7 @@ describe('Incoming Payment Resolver', (): void => {
         walletAddressId: uuid()
       }
 
+      expect.assertions(3)
       try {
         await appContainer.apolloClient
           .query({
@@ -275,7 +277,7 @@ describe('Incoming Payment Resolver', (): void => {
           })
         )
       }
-      await expect(createSpy).toHaveBeenCalledWith(input)
+      expect(createSpy).toHaveBeenCalledWith(input)
     })
   })
 
@@ -412,6 +414,7 @@ describe('Incoming Payment Resolver', (): void => {
         .spyOn(incomingPaymentService, 'get')
         .mockImplementation(async () => undefined)
 
+      expect.assertions(2)
       try {
         await appContainer.apolloClient.query({
           query: gql`