Fix tests to work with new jest version

Author: wildjames

packages/nhsNotifyUpdateCallback/tests/testHelpers.test.ts

@@ -167,7 +167,6 @@ describe("helpers.ts", () => {
 
       // Only QueryCommand should be called
       expect(sendSpy).toHaveBeenCalledTimes(1)
-      expect(sendSpy).toHaveBeenCalledWith(expect.any(QueryCommand))
       // Warning logged
       expect(logger.warn).toHaveBeenCalledWith(
         "No matching record found for NotifyMessageID. Counting this as a successful update.",
@@ -205,20 +204,17 @@ describe("helpers.ts", () => {
 
       await updateNotificationsTable(logger, mockResponse)
 
-      expect(sendSpy).toHaveBeenCalledWith(expect.any(QueryCommand))
-      expect(sendSpy).toHaveBeenCalledWith(
-        expect.objectContaining({
-          input: expect.objectContaining({
-            TableName: process.env.TABLE_NAME,
-            Key: {NHSNumber: mockItem.NHSNumber, ODSCode: mockItem.ODSCode},
-            ExpressionAttributeValues: {
-              ":ds": mockResponse.data[0].attributes.messageStatus,
-              ":ts": overrideTimestamp,
-              ":et": Math.floor(100_000_000 / 1000) + 60 * 60 * 24 * 7
-            }
-          })
-        })
-      )
+      const [updateCmd] = sendSpy.mock.calls[1]
+      expect((updateCmd).input).toMatchObject({
+        TableName: process.env.TABLE_NAME,
+        Key: {NHSNumber: mockItem.NHSNumber, ODSCode: mockItem.ODSCode},
+        ExpressionAttributeValues: {
+          ":ds": mockResponse.data[0].attributes.messageStatus,
+          ":ts": overrideTimestamp,
+          ":et": Math.floor(100_000_000 / 1000) + 60 * 60 * 24 * 7
+        }
+      })
+
       expect(logger.info).toHaveBeenCalledWith(
         "Updated notification state",
         expect.objectContaining({
@@ -336,8 +332,8 @@ describe("helpers.ts", () => {
       const {fetchSecrets: fn} = await import("../src/helpers")
       await expect(fn(logger)).resolves.toBeUndefined()
 
-      expect(mockGetSecret).toHaveBeenCalledWith(process.env.APP_NAME_SECRET)
-      expect(mockGetSecret).toHaveBeenCalledWith(process.env.API_KEY_SECRET)
+      expect(mockGetSecret).toHaveBeenCalledWith(process.env.APP_NAME_SECRET!)
+      expect(mockGetSecret).toHaveBeenCalledWith(process.env.API_KEY_SECRET!)
     })
   })
 })

packages/updatePrescriptionStatus/tests/testDatabaseClient.test.ts

@@ -107,7 +107,7 @@ describe("Unit test persistDataItems", () => {
 
     const result = await persistDataItems(dataItems, logger)
     expect(result).toBe(true)
-    expect(loggerSpy).not.toBeCalled()
+    expect(loggerSpy).not.toHaveBeenCalled()
   })
 
   it("call dynamo update twice when there is a large batch", async () => {
@@ -130,8 +130,8 @@ describe("Unit test persistDataItems", () => {
 
     const result = await persistDataItems(dataItems, logger)
     expect(result).toBe(true)
-    expect(loggerSpy).not.toBeCalled()
-    expect(mockSend).toBeCalledTimes(2)
+    expect(loggerSpy).not.toHaveBeenCalled()
+    expect(mockSend).toHaveBeenCalledTimes(2)
   })
 
   it("returns false when there is a general error", async () => {
@@ -171,6 +171,6 @@ describe("Unit test persistDataItems", () => {
 
     const result = await persistDataItems(dataItems, logger)
     expect(result).toBe(false)
-    expect(loggerSpy).toBeCalled()
+    expect(loggerSpy).toHaveBeenCalled()
   })
 })