Run all tests with mocha after all (#7076)

Author: cknitt

scripts/test.js

@@ -22,10 +22,6 @@ if (process.argv.includes("-mocha")) {
   mochaTest = true;
 }
 
-if (process.argv.includes("-node")) {
-  nodeTest = true;
-}
-
 if (process.argv.includes("-bsb")) {
   bsbTest = true;
 }
@@ -61,31 +57,23 @@ async function runTests() {
     });
   }
 
-  if (mochaTest || nodeTest) {
+  if (mochaTest) {
     cp.execSync(rescript_exe, {
       cwd: path.join(__dirname, "..", "tests/tests"),
       stdio: [0, 1, 2],
     });
+
     cp.execSync(rescript_exe, {
       cwd: path.join(__dirname, "..", "tests/tests_esmodule"),
       stdio: [0, 1, 2],
     });
-  }
 
-  if (mochaTest) {
     cp.execSync(`npx mocha -t 10000 tests/tests/**/*_test.js`, {
       cwd: path.join(__dirname, ".."),
       stdio: [0, 1, 2],
     });
   }
 
-  if (nodeTest) {
-    cp.execSync(`node --test tests/tests/**/*_ntest.js`, {
-      cwd: path.join(__dirname, ".."),
-      stdio: [0, 1, 2],
-    });
-  }
-
   if (bsbTest) {
     console.log("Doing build_tests");
     const buildTestDir = path.join(__dirname, "..", "tests", "build_tests");

tests/tests/src/belt_float_ntest.js

@@ -1,9 +1,9 @@
-open Node_test
-open Node_test_util
+open Mocha
+open Test_utils
 
 module F = Belt.Float
 
-describe("Belt.Float", () => {
+describe(__MODULE__, () => {
   test("fromInt", () => {
     eq(__LOC__, F.fromInt(1), 1.0)
     eq(__LOC__, F.fromInt(-1), -1.0)

tests/tests/src/belt_float_test.js

@@ -1,5 +1,5 @@
-open Node_test
-open Node_test_util
+open Mocha
+open Test_utils
 
 module N = Belt.HashMap
 module S = Belt.Map.Int
@@ -13,7 +13,7 @@ let cmp = (x: int, y) => compare(x, y)
 module Y = unpack(Belt.Id.hashable(~eq=intEq, ~hash=intHash))
 let empty: N.t<int, int, _> = N.make(~id=module(Y), ~hintSize=30)
 
-describe("Belt.HashMap", () => {
+describe(__MODULE__, () => {
   test("fromArray", () => {
     let u = A.concat(I.randomRange(30, 100), I.randomRange(40, 120))
     let v = A.zip(u, u)

tests/tests/src/belt_float_ntest.res tests/tests/src/belt_float_test.res

@@ -1,5 +1,5 @@
-open Node_test
-open Node_test_util
+open Mocha
+open Test_utils
 
 module N = Belt.HashSet.Int
 module S = Belt.Set.Int
@@ -15,7 +15,7 @@ let sum2 = h => {
   v.contents
 }
 
-describe("Belt.HashSet.Int", () => {
+describe(__MODULE__, () => {
   test("fromArray", () => {
     let u = A.concat(I.randomRange(30, 100), I.randomRange(40, 120))
     let v = N.fromArray(u)

tests/tests/src/belt_hashmap_ntest.js tests/tests/src/belt_hashmap_test.js

@@ -1,9 +1,9 @@
-open Node_test
-open Node_test_util
+open Mocha
+open Test_utils
 
 module I = Belt.Int
 
-describe("Belt.Int", () => {
+describe(__MODULE__, () => {
   test("toFloat", () => {
     eq(__LOC__, I.toFloat(1), 1.0)
     eq(__LOC__, I.toFloat(-1), -1.0)

tests/tests/src/belt_hashmap_ntest.res tests/tests/src/belt_hashmap_test.res

@@ -1,5 +1,5 @@
-open Node_test
-open Node_test_util
+open Mocha
+open Test_utils
 
 module N = Belt.List
 module A = Belt.Array
@@ -16,7 +16,7 @@ let sum2 = (xs, ys) => {
   v.contents
 }
 
-describe("Belt.List", () => {
+describe(__MODULE__, () => {
   test("makeBy", () => {
     let u = N.makeBy(5, i => i * i)
 

tests/tests/src/belt_hashset_int_ntest.js tests/tests/src/belt_hashset_int_test.js

@@ -1,11 +1,11 @@
 @@config({flags: ["-bs-no-cross-module-opt"]})
 
-open Node_test
-open Node_test_util
+open Mocha
+open Test_utils
 
 module M = Belt.Map.Int
 
-describe("Belt.Map.Int", () => {
+describe(__MODULE__, () => {
   test("set", () => {
     let m = ref(M.empty)
     let count = 100_0000 - 1

tests/tests/src/belt_hashset_int_ntest.res tests/tests/src/belt_hashset_int_test.res

@@ -1,5 +1,5 @@
-open Node_test
-open Node_test_util
+open Mocha
+open Test_utils
 
 module I = Array_data_util
 module R = Belt.Range
@@ -33,7 +33,7 @@ let diffs = (xs, ys) => {
   o
 }
 
-describe("Belt.SortArray", () => {
+describe(__MODULE__, () => {
   test("union", () => {
     eq(__LOC__, unions(I.range(1, 10), I.range(3, 13)), I.range(1, 13))
     eq(__LOC__, unions(I.range(1, 10), I.range(9, 13)), I.range(1, 13))

tests/tests/src/belt_int_ntest.js

@@ -1,5 +1,5 @@
-@module("node:test")
+@module("mocha")
 external test: (string, unit => unit) => unit = "test"
 
-@module("node:test")
+@module("mocha")
 external describe: (string, unit => unit) => unit = "describe"