@locustjs/test 2.0.1 → 2.0.2

package/src/TestRunner.js

@@ -4,6 +4,9 @@ import {
   isFunction,
   isArray,
   isIterable,
+  isString,
+  isEmpty,
+  typename,
 } from "@locustjs/base";
 import fs from "fs";
 import path from "path";
@@ -67,13 +70,26 @@ class TestRunner {
         });
       }
     }
-    if (!(test instanceof Test)) {
+
+    if (test == null) {
       this._unknown++;
 
       this._errors.push({
         index: i,
         err: new TestException({
-          message: `Given test is not an instance of '@locustjs/test:Test' class.`,
+          message: `No test was given.`,
+          code: 1505,
+          status: "no-test",
+        }),
+      });
+    } else if (!(test instanceof Test)) {
+      this._unknown++;
+      let testType = typename(test);
+
+      this._errors.push({
+        index: i,
+        err: new TestException({
+          message: `Given test is '${testType}'. Expected a function or an instance of '@locustjs/test:Test' class.`,
           code: 1504,
           status: "invalid-test",
         }),
@@ -83,12 +99,12 @@ class TestRunner {
       this._results.push(tr);
 
       if (isObject(tr.err)) {
-        if (!tr.expected) {
+        if (!tr.satisfied) {
           this._faulted++;
         } else {
           this._failed++;
         }
-      } else if (!tr.expected) {
+      } else if (!tr.satisfied) {
         this._unknown++;
       } else if (tr.success) {
         this._passed++;
@@ -116,13 +132,29 @@ class TestRunner {
         }
 
         if (isArray(tests)) {
-          const _tests = tests
-            .map((test) => {
+          const prs = tests
+            .map((test, i) => {
               let _test = test;
 
               if (isArray(test)) {
-                if (test.length == 2) {
-                  _test = new Test(test[0], test[1]);
+                if (test.length == 2 && isString(test[0])) {
+                  if (isFunction(test[1])) {
+                    _test = new Test(test[0], test[1]);
+                  } else if (test[1] instanceof Test) {
+                    _test = test[1];
+
+                    if (isEmpty(_test.name)) {
+                      _test.name = test[0];
+                    }
+                  } else {
+                    _test = test[1];
+                  }
+                } else if (test.length == 1) {
+                  if (test[0] instanceof Test) {
+                    _test = test[0];
+                  } else if (isFunction(test[0])) {
+                    _test = new Test("nonamed test " + i, test[0]);
+                  }
                 }
               }
 
@@ -130,7 +162,7 @@ class TestRunner {
             })
             .map((test, i) => this._runSingle(test, onProgress, i));
 
-          Promise.all(_tests)
+          Promise.all(prs)
             .then((_) => res(this.result))
             .catch((ex) => {
               this._errors.push({
@@ -193,12 +225,12 @@ class TestRunner {
                 i == err.length - 1
                   ? `${fgYellow}`
                   : `${fgGray}error ${testResult.err.code}: `
-              }${msg}${reset}`
+              }${msg}${reset}`,
           )
           .join("\n");
 
         if (isObject(testResult.err)) {
-          if (!testResult.expected) {
+          if (!testResult.satisfied) {
             message += `${bright}${fgWhite}${testResult.test}: ${fgYellow}faulted${reset} ${t}`;
             message += "\n";
             message += `${fgGray}${err} ${reset}`;
@@ -207,7 +239,7 @@ class TestRunner {
             message += "\n";
             message += `${fgGray}${err} ${reset}`;
           }
-        } else if (!testResult.expected) {
+        } else if (!testResult.satisfied) {
           message += `${bright}${fgWhite}${testResult.test}: ${fgMagenta}expect not used${reset} ${t}`;
 
           if (testResult.err) {
@@ -229,15 +261,21 @@ class TestRunner {
     }
 
     if (detailed && this._errors.length) {
-      console.log("Errors:");
+      console.log("\nErrors:");
 
       for (let error of this._errors) {
         if (error.index !== undefined) {
-          console.log(
-            `${error.index}. ${
-              error.test
-            }: ${error.err.innerException.toString()}`
-          );
+          if (error.err.innerException) {
+            console.log(
+              `${error.index}. ${
+                error.test
+              }: ${error.err.innerException.toString()}`,
+            );
+          } else {
+            console.log(
+              `${error.index}. ${error.err.status}: ${error.err.message}`,
+            );
+          }
         } else {
           console.log(`${error.err.toString()}`);
         }
@@ -274,7 +312,7 @@ class TestRunner {
         errors: this._errors,
       },
       null,
-      "\t"
+      "\t",
     );
 
     if (filename == null) {
@@ -310,7 +348,18 @@ class TestRunner {
 
       if (i != tests.length - 1 || !isBool(t)) {
         if (isIterable(t)) {
-          _tests = [..._tests, ...t];
+          if (
+            isArray(t) &&
+            t.length == 2 &&
+            isString(t[0]) &&
+            (isFunction(t[1]) || t[1] instanceof Test)
+          ) {
+            _tests.push(t);
+          } else {
+            _tests.push(...t);
+          }
+        } else {
+          _tests.push(["test " + i, t]);
         }
       }
     }

package/tests/index.js

@@ -7,7 +7,7 @@ class Buz {}
 const tests = [
   [
     "Test 1: number",
-    function (expect) {
+    function () {
       const n = 10;
 
       expect(n)
@@ -31,7 +31,7 @@ const tests = [
   ],
   [
     "Test 2: string",
-    function (expect) {
+    function () {
       const n = "10";
 
       expect(n)
@@ -45,7 +45,7 @@ const tests = [
   ],
   [
     "Test 3: empty array",
-    function (expect) {
+    function () {
       const n = [];
 
       expect(n).toBeDefined().toBeArray().toBeEmptyArray();
@@ -53,7 +53,7 @@ const tests = [
   ],
   [
     "Test 4: array",
-    function (expect) {
+    function () {
       const n = [10];
 
       expect(n).toBeDefined().toBeArray().toBeSomeArray();
@@ -61,7 +61,7 @@ const tests = [
   ],
   [
     "Test 5: empty object",
-    function (expect) {
+    function () {
       const n = {};
 
       expect(n)
@@ -75,7 +75,7 @@ const tests = [
   ],
   [
     "Test 6: object",
-    function (expect) {
+    function () {
       const n = { a: 10 };
 
       expect(n)
@@ -89,22 +89,22 @@ const tests = [
   ],
   [
     "Test 7: error",
-    function (expect) {
+    function () {
       const x = 30;
 
       expect(x).toBe(20);
     },
   ],
-  ["Test 8: expect not used", function (expect) {}],
+  ["Test 8: expect not used", function () {}],
   [
     "Test 9: error without expect",
-    function (expect) {
+    function () {
       throw "some err";
     },
   ],
   [
     "Test 10: class",
-    function (expect) {
+    function () {
       const x = new Bar();
 
       expect(x)