Merge pull request #10 from melange-community/anmonteiro/fix-tests-je…

…st27

fix: tests for Jest 27

dune-project

@@ -29,6 +29,4 @@
   (melange
    (>= "2.0.0"))
   (reason :with-test)
-  (melange-webapi :with-test)
-  (opam-check-npm-deps :with-test) ; todo: use with-dev-setup once opam 2.2 is out
-  (ocaml-lsp-server :with-test)))
+  (melange-webapi :with-test)))

flake.nix

@@ -31,7 +31,7 @@
 
           src = ./.;
           dontNpmBuild = true;
-          npmDepsHash = "sha256-FJEGqD2SwkGur+dSWtMW1Jr3Rmh68nQGUtEoprkXSfo=";
+          npmDepsHash = "sha256-ssHwcub4A3tHvpQ929o9qImgHjmHNEsP6waQIrT1jUE=";
           installPhase = ''
             runHook preInstall
             mkdir -p "$out"

jest-dom/__tests__/jest_dom_test.ml

@@ -1,3 +1,11 @@
+[@@@mel.config { flags = [| "--preamble";
+{|
+/**
+ * @jest-environment jsdom
+ */
+|}
+|] }]
+
 open Jest
 open JestDom
 open Webapi.Dom

jest/__tests__/globals_test.ml

@@ -229,7 +229,8 @@ let () =
     );
 
     describe "timeout should not fail suite" (fun () ->
-      afterAllAsync ~timeout:1 (fun _ ->());
+      (* In jest 27, they do. *)
+      (* afterAllAsync ~timeout:3 (fun _ ->()); *)
 
       test "" (fun () -> pass); (* runner will crash if there's no tests *)
     );
@@ -267,7 +268,8 @@ let () =
     );
 
     describe "timeout should not fail suite" (fun () ->
-      afterAllPromise ~timeout:1 (fun () -> Js.Promise.make (fun ~resolve:_ ~reject:_ -> ()));
+      (* In jest 27, they do. *)
+      (* afterAllPromise ~timeout:1 (fun () -> Js.Promise.make (fun ~resolve:_ ~reject:_ -> ())); *)
 
       test "" (fun () -> pass); (* runner will crash if there's no tests *)
     );

jest/__tests__/jest_test.ml

@@ -31,7 +31,7 @@ describe "Fake Timers" (fun () ->
 
   test "runAllImmediates" (fun () ->
     let flag = ref false in
-    Jest.useFakeTimers ();
+    Jest.useFakeTimers ~config:{legacyFakeTimers=true} ();
     setImmediate (fun () -> flag := true);
     let before = !flag in
     Jest.runAllImmediates ();
@@ -44,10 +44,10 @@ describe "Fake Timers" (fun () ->
     Jest.useFakeTimers ();
     setTimeout (fun () -> flag := true) 1500;
     let before = !flag in
-    Jest.runTimersToTime 1000;
+    Jest.advanceTimersByTime 1000;
     let inbetween = !flag in
-    Jest.runTimersToTime 1000;
-    
+    Jest.advanceTimersByTime 1000;
+
     expect (before, inbetween, !flag) = (false, false, true)
   );
 
@@ -90,6 +90,6 @@ describe "Fake Timers" (fun () ->
   testAsync "clearAllTimers" (fun finish ->
     Jest.useFakeTimers ();
     Jest.useRealTimers ();
-    setImmediate (fun () -> finish pass);
+    nextTick (fun () -> finish pass);
   );
 );

jest/__tests__/runner_test.ml

@@ -224,7 +224,8 @@ let () =
     );
 
     describe "timeout should not fail suite" (fun () ->
-      afterAllAsync ~timeout:1 (fun _ ->());
+      (* In jest 27, they do. *)
+      (* afterAllAsync ~timeout:1 (fun _ ->()); *)
 
       test "" (fun () -> true); (* runner will crash if there's no tests *)
     );
@@ -262,7 +263,8 @@ let () =
     );
 
     describe "timeout should not fail suite" (fun () ->
-      afterAllPromise ~timeout:1 (fun () -> Js.Promise.make (fun ~resolve:_ ~reject:_ -> ()));
+      (* In jest 27, they do. *)
+      (* afterAllPromise ~timeout:1 (fun () -> Js.Promise.make (fun ~resolve:_ ~reject:_ -> ())); *)
 
       test "" (fun () -> true); (* runner will crash if there's no tests *)
     );

jest/jest.ml

@@ -441,10 +441,12 @@ module Jest = struct
   external runAllTicks : unit -> unit = "jest.runAllTicks"
   external runAllTimers : unit -> unit = "jest.runAllTimers"
   external runAllImmediates : unit -> unit = "jest.runAllImmediates"
-  external runTimersToTime : int -> unit = "jest.runTimersToTime"
   external advanceTimersByTime : int -> unit = "jest.advanceTimersByTime"
   external runOnlyPendingTimers : unit -> unit = "jest.runOnlyPendingTimers"
-  external useFakeTimers : unit -> unit = "jest.useFakeTimers"
+  type fakeTimersConfig = {
+    legacyFakeTimers: bool
+  }
+  external useFakeTimers : ?config:fakeTimersConfig -> unit -> unit = "jest.useFakeTimers"
   external useRealTimers : unit -> unit = "jest.useRealTimers"
 end
 

jest/jest.mli

@@ -175,10 +175,12 @@ module Jest : sig
   external runAllTicks : unit -> unit = "jest.runAllTicks"
   external runAllTimers : unit -> unit = "jest.runAllTimers"
   external runAllImmediates : unit -> unit = "jest.runAllImmediates"
-  external runTimersToTime : int -> unit = "jest.runTimersToTime"
   external advanceTimersByTime : int -> unit = "jest.advanceTimersByTime"
   external runOnlyPendingTimers : unit -> unit = "jest.runOnlyPendingTimers"
-  external useFakeTimers : unit -> unit = "jest.useFakeTimers"
+  type fakeTimersConfig = {
+    legacyFakeTimers: bool
+  }
+  external useFakeTimers : ?config:fakeTimersConfig -> unit -> unit = "jest.useFakeTimers"
   external useRealTimers : unit -> unit = "jest.useRealTimers"
 end
 

melange-jest.opam.template

@@ -1,5 +1,6 @@
 depexts: [
-  ["jest"] {npm-version = "^26.5.2"}
+  ["jest"] {npm-version = "^27.0.0"}
+  ["jest-environment-jsdom"] {npm-version = "^27.0.0"}
   ["@testing-library/jest-dom"] {npm-version = "^5.10.0"}
 ]