test: add waitFor util, fix jasmine spies

Author: aminya

package.json

@@ -82,7 +82,7 @@
     "shx": "^0.3.3",
     "temp": "^0.9.4",
     "typescript": "^4.3.5",
-    "waitsfor": "^0.0.6"
+    "waitit": "^1.0.3"
   },
   "prettier": "prettier-config-atomic"
 }

pnpm-lock.yaml

@@ -4,9 +4,7 @@ import CodeFormatManager, { SAVE_TIMEOUT } from "../src/CodeFormatManager"
 import UniversalDisposable from "@atom-ide-community/nuclide-commons/UniversalDisposable"
 import temp from "temp"
 import * as config from "../src/config"
-import { waitsFor } from "waitsfor"
-
-const sleep = (n) => new Promise((r) => setTimeout(r, n))
+import { waitFor, sleep } from "./utils"
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = SAVE_TIMEOUT + 100
 describe("CodeFormatManager", () => {
@@ -39,9 +37,7 @@ describe("CodeFormatManager", () => {
     })
     textEditor.setText("abc")
     atom.commands.dispatch(atom.views.getView(textEditor), "code-format:format-code")
-    await waitsFor(() => textEditor.getText() === "def", {
-      timeout: SAVE_TIMEOUT,
-    })
+    await waitFor(() => textEditor.getText() === "def")
   })
   it("format an editor using formatEntireFile", async () => {
     manager.addFileProvider({
@@ -54,9 +50,7 @@ describe("CodeFormatManager", () => {
     })
     textEditor.setText("abc")
     atom.commands.dispatch(atom.views.getView(textEditor), "code-format:format-code")
-    await waitsFor(() => textEditor.getText() === "ghi", {
-      timeout: SAVE_TIMEOUT,
-    })
+    await waitFor(() => textEditor.getText() === "ghi")
   })
   it("formats an editor on type", async () => {
     spyOn(config, "getFormatOnType").and.returnValue(true)
@@ -79,11 +73,9 @@ describe("CodeFormatManager", () => {
     textEditor.setCursorBufferPosition([0, 1])
     textEditor.insertText("b")
     textEditor.insertText("c")
-    await waitsFor(() => textEditor.getText() === "def", {
-      timeout: SAVE_TIMEOUT,
-    })
+    await waitFor(() => textEditor.getText() === "def")
     // Debouncing should ensure only one format call.
-    expect(spy.mock.calls.length).toBe(1)
+    expect(spy.calls.count()).toBe(1)
   })
   it("formats an editor on save", async () => {
     spyOn(config, "getFormatOnSave").and.returnValue(true)
@@ -117,9 +109,7 @@ describe("CodeFormatManager", () => {
     textEditor.save()
     // Wait until the buffer has been saved and verify it has been saved exactly
     // once.
-    await waitsFor(() => spy.mock.calls.length > 0, {
-      timeout: SAVE_TIMEOUT,
-    })
-    expect(spy.mock.calls.length).toBe(1)
+    await waitFor(() => spy.calls.count() > 0)
+    expect(spy.calls.count()).toBe(1)
   })
 })

spec/CodeFormatManager-spec.ts

@@ -0,0 +1,16 @@
+import * as waitit from "waitit"
+
+/** Wait until a function returns true */
+export function waitFor(fn: (...args: any[]) => boolean, timeout = 2500) {
+  const interval = 100 // check very 100 ms
+  return waitit.start({
+    interval,
+    maxTicks: timeout / interval,
+    check: fn,
+  })
+}
+
+/** Sleep for ms */
+export function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}