fix: fix backend tests

interledger · Jul 5, 2022 · 807b8dd · 807b8dd
1 parent 9de95d3
commit 807b8dd
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 19 deletions.
diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -18,7 +18,7 @@
     "@graphql-codegen/typescript": "1.22.2",
     "@graphql-codegen/typescript-resolvers": "1.19.3",
     "@types/ioredis": "^4.22.3",
-    "@types/jest": "^26.0.22",
+    "@types/jest": "^28.1.4",
     "@types/koa": "^2.13.4",
     "@types/koa-bodyparser": "^4.3.0",
     "@types/koa__cors": "^3.0.2",

diff --git a/packages/backend/src/open_payments/account/service.test.ts b/packages/backend/src/open_payments/account/service.test.ts
@@ -114,8 +114,9 @@ describe('Open Payments Account Service', (): void => {
         let delayProcessAt: Date | null = null
 
         beforeEach((): void => {
-          jest.useFakeTimers('modern')
-          jest.setSystemTime(new Date())
+          jest.useFakeTimers({
+            now: new Date()
+          })
           if (withdrawalThrottleDelay !== undefined) {
             delayProcessAt = new Date(Date.now() + withdrawalThrottleDelay)
           }

diff --git a/packages/backend/src/open_payments/payment/incoming/service.test.ts b/packages/backend/src/open_payments/payment/incoming/service.test.ts
@@ -284,8 +284,9 @@ describe('Incoming Payment Service', (): void => {
 
     test('Sets state of fully paid incoming payment to "completed"', async (): Promise<void> => {
       const now = new Date()
-      jest.useFakeTimers('modern')
-      jest.setSystemTime(now)
+      jest.useFakeTimers({
+        now
+      })
       await expect(
         incomingPayment.onCredit({
           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -352,8 +353,7 @@ describe('Incoming Payment Service', (): void => {
         ).resolves.toBeUndefined()
 
         const now = incomingPayment.expiresAt
-        jest.useFakeTimers('modern')
-        jest.setSystemTime(now)
+        jest.useFakeTimers({ now })
         await expect(incomingPaymentService.processNext()).resolves.toBe(
           incomingPayment.id
         )
@@ -377,8 +377,7 @@ describe('Incoming Payment Service', (): void => {
           expiresAt: new Date(Date.now() + 30_000),
           externalRef: '#123'
         })
-        jest.useFakeTimers('modern')
-        jest.setSystemTime(incomingPayment.expiresAt)
+        jest.useFakeTimers({ now: incomingPayment.expiresAt })
         await expect(incomingPaymentService.processNext()).resolves.toBe(
           incomingPayment.id
         )
@@ -418,8 +417,7 @@ describe('Incoming Payment Service', (): void => {
               })
             ).resolves.toBeUndefined()
             if (eventType === IncomingPaymentEventType.IncomingPaymentExpired) {
-              jest.useFakeTimers('modern')
-              jest.setSystemTime(incomingPayment.expiresAt)
+              jest.useFakeTimers({ now: incomingPayment.expiresAt })
               await expect(incomingPaymentService.processNext()).resolves.toBe(
                 incomingPayment.id
               )
@@ -454,8 +452,7 @@ describe('Incoming Payment Service', (): void => {
             })
           ).resolves.toHaveLength(0)
           assert.ok(incomingPayment.processAt)
-          jest.useFakeTimers('modern')
-          jest.setSystemTime(incomingPayment.processAt)
+          jest.useFakeTimers({ now: incomingPayment.processAt })
           await expect(incomingPaymentService.processNext()).resolves.toBe(
             incomingPayment.id
           )
@@ -595,8 +592,7 @@ describe('Incoming Payment Service', (): void => {
         })
       ).resolves.toBeUndefined()
       const future = new Date(Date.now() + 40_000)
-      jest.useFakeTimers('modern')
-      jest.setSystemTime(future)
+      jest.useFakeTimers({ now: future })
       await expect(incomingPaymentService.processNext()).resolves.toBe(
         incomingPayment.id
       )

diff --git a/packages/backend/src/rates/service.test.ts b/packages/backend/src/rates/service.test.ts
@@ -37,8 +37,7 @@ describe('Rates service', function () {
       deps = await initIocContainer(config)
       deps.bind('messageProducer', async () => mockMessageProducer)
       appContainer = await createTestApp(deps)
-      jest.useFakeTimers('modern')
-      jest.setSystemTime(1600000000000)
+      jest.useFakeTimers({ now: 1600000000000 })
     }
   )
 

diff --git a/packages/backend/src/session/service.test.ts b/packages/backend/src/session/service.test.ts
@@ -23,7 +23,7 @@ describe('Session Key Service', (): void => {
 
   beforeEach(
     async (): Promise<void> => {
-      jest.useFakeTimers('modern')
+      jest.useFakeTimers()
     }
   )
 

diff --git a/yarn.lock b/yarn.lock
@@ -4999,7 +4999,7 @@ __metadata:
     "@koa/router": ^10.0.0
     "@types/bcrypt": ^5.0.0
     "@types/ioredis": ^4.22.3
-    "@types/jest": ^26.0.22
+    "@types/jest": ^28.1.4
     "@types/koa": ^2.13.4
     "@types/koa-bodyparser": ^4.3.0
     "@types/koa__cors": ^3.0.2