test(use-dataloader): wait for expect instead of trusting setImmediate (#571)

* test(use-dataloader): wait for expect instead of trusting setImmediate

* fix: exact

Author: chambo-e

package.json

@@ -36,7 +36,8 @@
     "rollup": "2.62.0",
     "rollup-plugin-dts": "4.1.0",
     "rollup-plugin-visualizer": "5.5.2",
-    "typescript": "4.5.4"
+    "typescript": "4.5.4",
+    "wait-for-expect": "3.0.2"
   },
   "scripts": {
     "lint": "eslint --ext js,ts,tsx --cache .",

packages/use-dataloader/src/__tests__/dataloader.test.ts

@@ -1,3 +1,5 @@
+import { nextTick } from 'process';
+import waitForExpect from 'wait-for-expect'
 import { StatusEnum } from '../constants'
 import DataLoader from '../dataloader'
 
@@ -203,16 +205,15 @@ describe('Dataloader class', () => {
     expect(method).toBeCalledTimes(3)
     await instance.load()
     await instance.load()
-    await new Promise(resolve => {
-      setTimeout(resolve)
-    })
+    await new Promise(nextTick)
     expect(method).toBeCalledTimes(4)
     await instance.load()
     await instance.load()
     await instance.load(true)
     await new Promise(resolve => {
       setTimeout(resolve)
     })
+    await new Promise(nextTick)
     expect(method).toBeCalledTimes(6)
     instance.setPollingInterval(PROMISE_TIMEOUT * 4)
     await instance.destroy()
@@ -238,17 +239,15 @@ describe('Dataloader class', () => {
     expect(method).toBeCalledTimes(3)
     await instance.load()
     await instance.load()
-    await new Promise(resolve => {
-      setTimeout(resolve)
+    await waitForExpect(() => {
+      expect(method).toBeCalledTimes(4)
     })
-    expect(method).toBeCalledTimes(4)
     await instance.load()
     await instance.load()
     await instance.load(true)
-    await new Promise(resolve => {
-      setTimeout(resolve)
+    await waitForExpect(() => {
+      expect(method).toBeCalledTimes(6)
     })
-    expect(method).toBeCalledTimes(6)
     instance.setPollingInterval(PROMISE_TIMEOUT * 4)
     await instance.destroy()
   })
@@ -310,9 +309,8 @@ describe('Dataloader class', () => {
       expect(instance.status).toBe(StatusEnum.LOADING)
     }
     // Because wait for setTimeout tryLaunch in dataloader.ts
-    await new Promise(resolve => {
-      setTimeout(resolve)
+    await waitForExpect(() => {
+      expect(method).toBeCalledTimes(2)
     })
-    expect(method).toBeCalledTimes(2)
   })
 })

yarn.lock

@@ -10147,6 +10147,7 @@ __metadata:
     rollup-plugin-dts: 4.1.0
     rollup-plugin-visualizer: 5.5.2
     typescript: 4.5.4
+    wait-for-expect: 3.0.2
   languageName: unknown
   linkType: soft
 
@@ -11450,6 +11451,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"wait-for-expect@npm:3.0.2":
+  version: 3.0.2
+  resolution: "wait-for-expect@npm:3.0.2"
+  checksum: 2ec1ebd78023fa10bdcf53d78bbd65feea68fdfa0de0b00f3a72f3df089118b91517839ff3926e5ef6cfd1ede65085326d85b0378d4db62c266cc9c859c2de56
+  languageName: node
+  linkType: hard
+
 "walker@npm:^1.0.7":
   version: 1.0.8
   resolution: "walker@npm:1.0.8"