@locustjs/test 2.0.1 → 2.0.2

package/dist/index.js

@@ -5,6 +5,9 @@ var fs = require('fs');
 var path = require('path');
 var exception = require('@locustjs/exception');
 
+function _OverloadYield(e, d) {
+  this.v = e, this.k = d;
+}
 function _arrayLikeToArray(r, a) {
   (null == a || a > r.length) && (a = r.length);
   for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
@@ -143,306 +146,178 @@ function _possibleConstructorReturn(t, e) {
   if (undefined !== e) throw new TypeError("Derived constructors may only return object or undefined");
   return _assertThisInitialized(t);
 }
-function _regeneratorRuntime() {
-  _regeneratorRuntime = function () {
-    return e;
-  };
-  var t,
-    e = {},
-    r = Object.prototype,
-    n = r.hasOwnProperty,
-    o = Object.defineProperty || function (t, e, r) {
-      t[e] = r.value;
-    },
-    i = "function" == typeof Symbol ? Symbol : {},
-    a = i.iterator || "@@iterator",
-    c = i.asyncIterator || "@@asyncIterator",
-    u = i.toStringTag || "@@toStringTag";
-  function define(t, e, r) {
-    return Object.defineProperty(t, e, {
-      value: r,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    }), t[e];
-  }
-  try {
-    define({}, "");
-  } catch (t) {
-    define = function (t, e, r) {
-      return t[e] = r;
-    };
-  }
-  function wrap(t, e, r, n) {
-    var i = e && e.prototype instanceof Generator ? e : Generator,
-      a = Object.create(i.prototype),
-      c = new Context(n || []);
-    return o(a, "_invoke", {
-      value: makeInvokeMethod(t, r, c)
-    }), a;
-  }
-  function tryCatch(t, e, r) {
-    try {
-      return {
-        type: "normal",
-        arg: t.call(e, r)
-      };
-    } catch (t) {
-      return {
-        type: "throw",
-        arg: t
+function _regenerator() {
+  /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */
+  var e,
+    t,
+    r = "function" == typeof Symbol ? Symbol : {},
+    n = r.iterator || "@@iterator",
+    o = r.toStringTag || "@@toStringTag";
+  function i(r, n, o, i) {
+    var c = n && n.prototype instanceof Generator ? n : Generator,
+      u = Object.create(c.prototype);
+    return _regeneratorDefine(u, "_invoke", function (r, n, o) {
+      var i,
+        c,
+        u,
+        f = 0,
+        p = o || [],
+        y = false,
+        G = {
+          p: 0,
+          n: 0,
+          v: e,
+          a: d,
+          f: d.bind(e, 4),
+          d: function (t, r) {
+            return i = t, c = 0, u = e, G.n = r, a;
+          }
+        };
+      function d(r, n) {
+        for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) {
+          var o,
+            i = p[t],
+            d = G.p,
+            l = i[2];
+          r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0));
+        }
+        if (o || r > 1) return a;
+        throw y = true, n;
+      }
+      return function (o, p, l) {
+        if (f > 1) throw TypeError("Generator is already running");
+        for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) {
+          i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u);
+          try {
+            if (f = 2, i) {
+              if (c || (o = "next"), t = i[o]) {
+                if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object");
+                if (!t.done) return t;
+                u = t.value, c < 2 && (c = 0);
+              } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1);
+              i = e;
+            } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break;
+          } catch (t) {
+            i = e, c = 1, u = t;
+          } finally {
+            f = 1;
+          }
+        }
+        return {
+          value: t,
+          done: y
+        };
       };
-    }
+    }(r, o, i), true), u;
   }
-  e.wrap = wrap;
-  var h = "suspendedStart",
-    l = "suspendedYield",
-    f = "executing",
-    s = "completed",
-    y = {};
+  var a = {};
   function Generator() {}
   function GeneratorFunction() {}
   function GeneratorFunctionPrototype() {}
-  var p = {};
-  define(p, a, function () {
+  t = Object.getPrototypeOf;
+  var c = [][n] ? t(t([][n]())) : (_regeneratorDefine(t = {}, n, function () {
+      return this;
+    }), t),
+    u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c);
+  function f(e) {
+    return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e;
+  }
+  return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine(u), _regeneratorDefine(u, o, "Generator"), _regeneratorDefine(u, n, function () {
     return this;
+  }), _regeneratorDefine(u, "toString", function () {
+    return "[object Generator]";
+  }), (_regenerator = function () {
+    return {
+      w: i,
+      m: f
+    };
+  })();
+}
+function _regeneratorAsync(n, e, r, t, o) {
+  var a = _regeneratorAsyncGen(n, e, r, t, o);
+  return a.next().then(function (n) {
+    return n.done ? n.value : a.next();
   });
-  var d = Object.getPrototypeOf,
-    v = d && d(d(values([])));
-  v && v !== r && n.call(v, a) && (p = v);
-  var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p);
-  function defineIteratorMethods(t) {
-    ["next", "throw", "return"].forEach(function (e) {
-      define(t, e, function (t) {
-        return this._invoke(e, t);
+}
+function _regeneratorAsyncGen(r, e, t, o, n) {
+  return new _regeneratorAsyncIterator(_regenerator().w(r, e, t, o), n || Promise);
+}
+function _regeneratorAsyncIterator(t, e) {
+  function n(r, o, i, f) {
+    try {
+      var c = t[r](o),
+        u = c.value;
+      return u instanceof _OverloadYield ? e.resolve(u.v).then(function (t) {
+        n("next", t, i, f);
+      }, function (t) {
+        n("throw", t, i, f);
+      }) : e.resolve(u).then(function (t) {
+        c.value = t, i(c);
+      }, function (t) {
+        return n("throw", t, i, f);
       });
-    });
+    } catch (t) {
+      f(t);
+    }
   }
-  function AsyncIterator(t, e) {
-    function invoke(r, o, i, a) {
-      var c = tryCatch(t[r], t, o);
-      if ("throw" !== c.type) {
-        var u = c.arg,
-          h = u.value;
-        return h && "object" == typeof h && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) {
-          invoke("next", t, i, a);
-        }, function (t) {
-          invoke("throw", t, i, a);
-        }) : e.resolve(h).then(function (t) {
-          u.value = t, i(u);
-        }, function (t) {
-          return invoke("throw", t, i, a);
-        });
-      }
-      a(c.arg);
-    }
-    var r;
-    o(this, "_invoke", {
-      value: function (t, n) {
-        function callInvokeWithMethodAndArg() {
-          return new e(function (e, r) {
-            invoke(t, n, e, r);
-          });
-        }
-        return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg();
-      }
-    });
+  var r;
+  this.next || (_regeneratorDefine(_regeneratorAsyncIterator.prototype), _regeneratorDefine(_regeneratorAsyncIterator.prototype, "function" == typeof Symbol && Symbol.asyncIterator || "@asyncIterator", function () {
+    return this;
+  })), _regeneratorDefine(this, "_invoke", function (t, o, i) {
+    function f() {
+      return new e(function (e, r) {
+        n(t, i, e, r);
+      });
+    }
+    return r = r ? r.then(f, f) : f();
+  }, true);
+}
+function _regeneratorDefine(e, r, n, t) {
+  var i = Object.defineProperty;
+  try {
+    i({}, "", {});
+  } catch (e) {
+    i = 0;
   }
-  function makeInvokeMethod(e, r, n) {
-    var o = h;
-    return function (i, a) {
-      if (o === f) throw Error("Generator is already running");
-      if (o === s) {
-        if ("throw" === i) throw a;
-        return {
-          value: t,
-          done: true
+  _regeneratorDefine = function (e, r, n, t) {
+    function o(r, n) {
+      _regeneratorDefine(e, r, function (e) {
+        return this._invoke(r, n, e);
+      });
+    }
+    r ? i ? i(e, r, {
+      value: n,
+      enumerable: !t,
+      configurable: !t,
+      writable: !t
+    }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2));
+  }, _regeneratorDefine(e, r, n, t);
+}
+function _regeneratorKeys(e) {
+  var n = Object(e),
+    r = [];
+  for (var t in n) r.unshift(t);
+  return function e() {
+    for (; r.length;) if ((t = r.pop()) in n) return e.value = t, e.done = false, e;
+    return e.done = true, e;
+  };
+}
+function _regeneratorValues(e) {
+  if (null != e) {
+    var t = e["function" == typeof Symbol && Symbol.iterator || "@@iterator"],
+      r = 0;
+    if (t) return t.call(e);
+    if ("function" == typeof e.next) return e;
+    if (!isNaN(e.length)) return {
+      next: function () {
+        return e && r >= e.length && (e = undefined), {
+          value: e && e[r++],
+          done: !e
         };
       }
-      for (n.method = i, n.arg = a;;) {
-        var c = n.delegate;
-        if (c) {
-          var u = maybeInvokeDelegate(c, n);
-          if (u) {
-            if (u === y) continue;
-            return u;
-          }
-        }
-        if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) {
-          if (o === h) throw o = s, n.arg;
-          n.dispatchException(n.arg);
-        } else "return" === n.method && n.abrupt("return", n.arg);
-        o = f;
-        var p = tryCatch(e, r, n);
-        if ("normal" === p.type) {
-          if (o = n.done ? s : l, p.arg === y) continue;
-          return {
-            value: p.arg,
-            done: n.done
-          };
-        }
-        "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg);
-      }
     };
   }
-  function maybeInvokeDelegate(e, r) {
-    var n = r.method,
-      o = e.iterator[n];
-    if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y;
-    var i = tryCatch(o, e.iterator, r.arg);
-    if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y;
-    var a = i.arg;
-    return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y);
-  }
-  function pushTryEntry(t) {
-    var e = {
-      tryLoc: t[0]
-    };
-    1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e);
-  }
-  function resetTryEntry(t) {
-    var e = t.completion || {};
-    e.type = "normal", delete e.arg, t.completion = e;
-  }
-  function Context(t) {
-    this.tryEntries = [{
-      tryLoc: "root"
-    }], t.forEach(pushTryEntry, this), this.reset(true);
-  }
-  function values(e) {
-    if (e || "" === e) {
-      var r = e[a];
-      if (r) return r.call(e);
-      if ("function" == typeof e.next) return e;
-      if (!isNaN(e.length)) {
-        var o = -1,
-          i = function next() {
-            for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = false, next;
-            return next.value = t, next.done = true, next;
-          };
-        return i.next = i;
-      }
-    }
-    throw new TypeError(typeof e + " is not iterable");
-  }
-  return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", {
-    value: GeneratorFunctionPrototype,
-    configurable: true
-  }), o(GeneratorFunctionPrototype, "constructor", {
-    value: GeneratorFunction,
-    configurable: true
-  }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) {
-    var e = "function" == typeof t && t.constructor;
-    return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name));
-  }, e.mark = function (t) {
-    return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t;
-  }, e.awrap = function (t) {
-    return {
-      __await: t
-    };
-  }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () {
-    return this;
-  }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) {
-    undefined === i && (i = Promise);
-    var a = new AsyncIterator(wrap(t, r, n, o), i);
-    return e.isGeneratorFunction(r) ? a : a.next().then(function (t) {
-      return t.done ? t.value : a.next();
-    });
-  }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () {
-    return this;
-  }), define(g, "toString", function () {
-    return "[object Generator]";
-  }), e.keys = function (t) {
-    var e = Object(t),
-      r = [];
-    for (var n in e) r.push(n);
-    return r.reverse(), function next() {
-      for (; r.length;) {
-        var t = r.pop();
-        if (t in e) return next.value = t, next.done = false, next;
-      }
-      return next.done = true, next;
-    };
-  }, e.values = values, Context.prototype = {
-    constructor: Context,
-    reset: function (e) {
-      if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = false, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t);
-    },
-    stop: function () {
-      this.done = true;
-      var t = this.tryEntries[0].completion;
-      if ("throw" === t.type) throw t.arg;
-      return this.rval;
-    },
-    dispatchException: function (e) {
-      if (this.done) throw e;
-      var r = this;
-      function handle(n, o) {
-        return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o;
-      }
-      for (var o = this.tryEntries.length - 1; o >= 0; --o) {
-        var i = this.tryEntries[o],
-          a = i.completion;
-        if ("root" === i.tryLoc) return handle("end");
-        if (i.tryLoc <= this.prev) {
-          var c = n.call(i, "catchLoc"),
-            u = n.call(i, "finallyLoc");
-          if (c && u) {
-            if (this.prev < i.catchLoc) return handle(i.catchLoc, true);
-            if (this.prev < i.finallyLoc) return handle(i.finallyLoc);
-          } else if (c) {
-            if (this.prev < i.catchLoc) return handle(i.catchLoc, true);
-          } else {
-            if (!u) throw Error("try statement without catch or finally");
-            if (this.prev < i.finallyLoc) return handle(i.finallyLoc);
-          }
-        }
-      }
-    },
-    abrupt: function (t, e) {
-      for (var r = this.tryEntries.length - 1; r >= 0; --r) {
-        var o = this.tryEntries[r];
-        if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) {
-          var i = o;
-          break;
-        }
-      }
-      i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null);
-      var a = i ? i.completion : {};
-      return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a);
-    },
-    complete: function (t, e) {
-      if ("throw" === t.type) throw t.arg;
-      return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y;
-    },
-    finish: function (t) {
-      for (var e = this.tryEntries.length - 1; e >= 0; --e) {
-        var r = this.tryEntries[e];
-        if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y;
-      }
-    },
-    catch: function (t) {
-      for (var e = this.tryEntries.length - 1; e >= 0; --e) {
-        var r = this.tryEntries[e];
-        if (r.tryLoc === t) {
-          var n = r.completion;
-          if ("throw" === n.type) {
-            var o = n.arg;
-            resetTryEntry(r);
-          }
-          return o;
-        }
-      }
-      throw Error("illegal catch attempt");
-    },
-    delegateYield: function (e, r, n) {
-      return this.delegate = {
-        iterator: values(e),
-        resultName: r,
-        nextLoc: n
-      }, "next" === this.method && (this.arg = t), y;
-    }
-  }, e;
+  throw new TypeError(typeof e + " is not iterable");
 }
 function _setPrototypeOf(t, e) {
   return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
@@ -482,6 +357,74 @@ function _unsupportedIterableToArray(r, a) {
     return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : undefined;
   }
 }
+function _regeneratorRuntime() {
+
+  var r = _regenerator(),
+    e = r.m(_regeneratorRuntime),
+    t = (Object.getPrototypeOf ? Object.getPrototypeOf(e) : e.__proto__).constructor;
+  function n(r) {
+    var e = "function" == typeof r && r.constructor;
+    return !!e && (e === t || "GeneratorFunction" === (e.displayName || e.name));
+  }
+  var o = {
+    throw: 1,
+    return: 2,
+    break: 3,
+    continue: 3
+  };
+  function a(r) {
+    var e, t;
+    return function (n) {
+      e || (e = {
+        stop: function () {
+          return t(n.a, 2);
+        },
+        catch: function () {
+          return n.v;
+        },
+        abrupt: function (r, e) {
+          return t(n.a, o[r], e);
+        },
+        delegateYield: function (r, o, a) {
+          return e.resultName = o, t(n.d, _regeneratorValues(r), a);
+        },
+        finish: function (r) {
+          return t(n.f, r);
+        }
+      }, t = function (r, t, o) {
+        n.p = e.prev, n.n = e.next;
+        try {
+          return r(t, o);
+        } finally {
+          e.next = n.n;
+        }
+      }), e.resultName && (e[e.resultName] = n.v, e.resultName = undefined), e.sent = n.v, e.next = n.n;
+      try {
+        return r.call(this, e);
+      } finally {
+        n.p = e.prev, n.n = e.next;
+      }
+    };
+  }
+  return (_regeneratorRuntime = function () {
+    return {
+      wrap: function (e, t, n, o) {
+        return r.w(a(e), t, n, o && o.reverse());
+      },
+      isGeneratorFunction: n,
+      mark: r.m,
+      awrap: function (r, e) {
+        return new _OverloadYield(r, e);
+      },
+      AsyncIterator: _regeneratorAsyncIterator,
+      async: function (r, e, t, o, u) {
+        return (n(e) ? _regeneratorAsyncGen : _regeneratorAsync)(a(r), e, t, o, u);
+      },
+      keys: _regeneratorKeys,
+      values: _regeneratorValues
+    };
+  })();
+}
 
 var TestException = /*#__PURE__*/function (_Exception) {
   function TestException() {
@@ -496,17 +439,17 @@ var Expect = /*#__PURE__*/function () {
   function Expect(value) {
     _classCallCheck(this, Expect);
     this.value = value;
-    this._expected = false;
+    this._satisfied = false;
   }
   return _createClass(Expect, [{
-    key: "expected",
+    key: "satisfied",
     get: function get() {
-      return this._expected;
+      return this._satisfied;
     }
   }, {
     key: "toBe",
     value: function toBe(value) {
-      this._expected = true;
+      this._satisfied = true;
       if (this.value === value) ; else {
         throw new TestException({
           message: "".concat(this.value, " is not equal to ").concat(value),
@@ -519,7 +462,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBe",
     value: function notToBe(value) {
-      this._expected = true;
+      this._satisfied = true;
       if (this.value === value) {
         throw new TestException({
           message: "".concat(value, " is equal to ").concat(this.value),
@@ -532,7 +475,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeGt",
     value: function toBeGt(value) {
-      this._expected = true;
+      this._satisfied = true;
       if (this.value <= value) {
         throw new TestException({
           message: "".concat(this.value, " is not greater than ").concat(value),
@@ -550,7 +493,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeGte",
     value: function toBeGte(value) {
-      this._expected = true;
+      this._satisfied = true;
       if (this.value < value) {
         throw new TestException({
           message: "".concat(this.value, " is not greater than or equal to ").concat(value),
@@ -568,7 +511,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeLt",
     value: function toBeLt(value) {
-      this._expected = true;
+      this._satisfied = true;
       if (this.value >= value) {
         throw new TestException({
           message: "".concat(this.value, " is not less than ").concat(value),
@@ -586,7 +529,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeLte",
     value: function toBeLte(value) {
-      this._expected = true;
+      this._satisfied = true;
       if (this.value > value) {
         throw new TestException({
           message: "".concat(this.value, " is not less than or equal to ").concat(value),
@@ -604,7 +547,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeBetween",
     value: function toBeBetween(n, m) {
-      this._expected = true;
+      this._satisfied = true;
       if (!(this.value >= n && this.value < m)) {
         throw new TestException({
           message: "".concat(this.value, " is not between ").concat(n, " and ").concat(m),
@@ -617,7 +560,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeBetween",
     value: function notToBeBetween(n, m) {
-      this._expected = true;
+      this._satisfied = true;
       if (this.value >= n && this.value < m) {
         throw new TestException({
           message: "".concat(this.value, " is between ").concat(n, " and ").concat(m),
@@ -630,7 +573,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeOfType",
     value: function toBeOfType(type) {
-      this._expected = true;
+      this._satisfied = true;
       if (_typeof(this.value) !== type) {
         throw new TestException({
           message: "".concat(this.value, " is not of type ").concat(type),
@@ -643,7 +586,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeOfType",
     value: function notToBeOfType(type) {
-      this._expected = true;
+      this._satisfied = true;
       if (_typeof(this.value) === type) {
         throw new TestException({
           message: "".concat(this.value, " is of type ").concat(type),
@@ -656,7 +599,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeString",
     value: function toBeString() {
-      this._expected = true;
+      this._satisfied = true;
       if (!base.isString(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is not string"),
@@ -669,7 +612,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeString",
     value: function notToBeString() {
-      this._expected = true;
+      this._satisfied = true;
       if (base.isString(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is string"),
@@ -682,7 +625,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeSomeString",
     value: function toBeSomeString() {
-      this._expected = true;
+      this._satisfied = true;
       if (!base.isSomeString(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is not some string"),
@@ -695,7 +638,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeSomeString",
     value: function notToBeSomeString() {
-      this._expected = true;
+      this._satisfied = true;
       if (base.isSomeString(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is some string"),
@@ -708,7 +651,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeNumber",
     value: function toBeNumber() {
-      this._expected = true;
+      this._satisfied = true;
       if (!base.isNumber(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is not number"),
@@ -721,7 +664,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeNumber",
     value: function notToBeNumber() {
-      this._expected = true;
+      this._satisfied = true;
       if (base.isNumber(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is number"),
@@ -734,7 +677,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeDate",
     value: function toBeDate() {
-      this._expected = true;
+      this._satisfied = true;
       if (!base.isDate(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is not date"),
@@ -747,7 +690,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeDate",
     value: function notToBeDate() {
-      this._expected = true;
+      this._satisfied = true;
       if (base.isDate(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is date"),
@@ -760,7 +703,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeBool",
     value: function toBeBool() {
-      this._expected = true;
+      this._satisfied = true;
       if (!base.isBool(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is not bool"),
@@ -773,7 +716,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeBool",
     value: function notToBeBool() {
-      this._expected = true;
+      this._satisfied = true;
       if (base.isBool(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is bool"),
@@ -786,7 +729,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeBasicType",
     value: function toBeBasicType() {
-      this._expected = true;
+      this._satisfied = true;
       if (!base.isBasic(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is not basic type"),
@@ -799,7 +742,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeBasicType",
     value: function notToBeBasicType() {
-      this._expected = true;
+      this._satisfied = true;
       if (base.isBasic(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is basic type"),
@@ -812,7 +755,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBePrimitive",
     value: function toBePrimitive() {
-      this._expected = true;
+      this._satisfied = true;
       if (!base.isPrimitive(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is not primitive type"),
@@ -825,7 +768,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBePrimitive",
     value: function notToBePrimitive() {
-      this._expected = true;
+      this._satisfied = true;
       if (base.isPrimitive(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is primitive type"),
@@ -838,7 +781,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeEmpty",
     value: function toBeEmpty() {
-      this._expected = true;
+      this._satisfied = true;
       if (!base.isEmpty(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is not empty"),
@@ -851,7 +794,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeEmpty",
     value: function notToBeEmpty() {
-      this._expected = true;
+      this._satisfied = true;
       if (base.isEmpty(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is empty"),
@@ -864,7 +807,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeObject",
     value: function toBeObject() {
-      this._expected = true;
+      this._satisfied = true;
       if (!base.isObject(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is not object"),
@@ -877,7 +820,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeObject",
     value: function notToBeObject() {
-      this._expected = true;
+      this._satisfied = true;
       if (base.isObject(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is object"),
@@ -890,7 +833,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeSomeObject",
     value: function toBeSomeObject() {
-      this._expected = true;
+      this._satisfied = true;
       if (!base.isSomeObject(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is not some object"),
@@ -903,7 +846,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeSomeObject",
     value: function notToBeSomeObject() {
-      this._expected = true;
+      this._satisfied = true;
       if (base.isSomeObject(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is some object"),
@@ -916,7 +859,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeFunction",
     value: function toBeFunction() {
-      this._expected = true;
+      this._satisfied = true;
       if (!base.isFunction(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is not function"),
@@ -929,7 +872,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeFunction",
     value: function notToBeFunction() {
-      this._expected = true;
+      this._satisfied = true;
       if (base.isFunction(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is function"),
@@ -942,7 +885,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeNumeric",
     value: function toBeNumeric() {
-      this._expected = true;
+      this._satisfied = true;
       if (!base.isNumeric(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is not numeric"),
@@ -955,7 +898,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeNumeric",
     value: function notToBeNumeric() {
-      this._expected = true;
+      this._satisfied = true;
       if (base.isNumeric(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is numeric"),
@@ -968,7 +911,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeArray",
     value: function toBeArray() {
-      this._expected = true;
+      this._satisfied = true;
       if (!base.isArray(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is not array"),
@@ -981,7 +924,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeArray",
     value: function notToBeArray() {
-      this._expected = true;
+      this._satisfied = true;
       if (base.isArray(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is array"),
@@ -994,7 +937,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeSomeArray",
     value: function toBeSomeArray() {
-      this._expected = true;
+      this._satisfied = true;
       if (!base.isSomeArray(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is not some array"),
@@ -1007,7 +950,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeSomeArray",
     value: function notToBeSomeArray() {
-      this._expected = true;
+      this._satisfied = true;
       if (!base.isArray(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is not array"),
@@ -1027,7 +970,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeIterable",
     value: function toBeIterable() {
-      this._expected = true;
+      this._satisfied = true;
       if (!base.isIterable(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is not iterable"),
@@ -1040,7 +983,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeIterable",
     value: function notToBeIterable() {
-      this._expected = true;
+      this._satisfied = true;
       if (base.isIterable(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is iterable"),
@@ -1053,7 +996,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeSubClassOf",
     value: function toBeSubClassOf(type) {
-      this._expected = true;
+      this._satisfied = true;
       if (!base.isSubClassOf(this.value, type)) {
         throw new TestException({
           message: "".concat(this.value, " is not subclass of ").concat(type),
@@ -1066,7 +1009,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeSubClassOf",
     value: function notToBeSubClassOf(type) {
-      this._expected = true;
+      this._satisfied = true;
       if (base.isSubClassOf(this.value, type)) {
         throw new TestException({
           message: "".concat(this.value, " is subclass of ").concat(type),
@@ -1079,7 +1022,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeInstanceOf",
     value: function toBeInstanceOf(type) {
-      this._expected = true;
+      this._satisfied = true;
       if (!(this.value instanceof type)) {
         throw new TestException({
           message: "".concat(this.value, " is not instance of ").concat(type),
@@ -1092,7 +1035,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeInstanceOf",
     value: function notToBeInstanceOf(type) {
-      this._expected = true;
+      this._satisfied = true;
       if (this.value instanceof type) {
         throw new TestException({
           message: "".concat(this.value, " is instance of ").concat(type),
@@ -1105,7 +1048,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toMatch",
     value: function toMatch(pattern, flags) {
-      this._expected = true;
+      this._satisfied = true;
       var r = new RegExp(pattern, flags);
       if (!r.test(this.value)) {
         throw new TestException({
@@ -1119,7 +1062,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToMatch",
     value: function notToMatch(pattern, flags) {
-      this._expected = true;
+      this._satisfied = true;
       var r = new RegExp(pattern, flags);
       if (r.test(this.value)) {
         throw new TestException({
@@ -1133,7 +1076,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "doesNotMatch",
     value: function doesNotMatch(pattern, flags) {
-      this._expected = true;
+      this._satisfied = true;
       var r = new RegExp(pattern, flags);
       if (r.test(this.value)) {
         throw new TestException({
@@ -1147,7 +1090,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeDefined",
     value: function toBeDefined() {
-      this._expected = true;
+      this._satisfied = true;
       if (this.value === undefined) {
         throw new TestException({
           message: "value is undefined",
@@ -1160,7 +1103,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeDefined",
     value: function notToBeDefined() {
-      this._expected = true;
+      this._satisfied = true;
       if (this.value !== undefined) {
         throw new TestException({
           message: "value is defined",
@@ -1173,7 +1116,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeUndefined",
     value: function toBeUndefined() {
-      this._expected = true;
+      this._satisfied = true;
       if (this.value !== undefined) {
         throw new TestException({
           message: "value is defined",
@@ -1186,7 +1129,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeUndefined",
     value: function notToBeUndefined() {
-      this._expected = true;
+      this._satisfied = true;
       if (this.value === undefined) {
         throw new TestException({
           message: "value is undefined",
@@ -1199,7 +1142,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeNull",
     value: function toBeNull() {
-      this._expected = true;
+      this._satisfied = true;
       if (this.value !== null) {
         throw new TestException({
           message: "value is not null",
@@ -1212,7 +1155,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeNull",
     value: function notToBeNull() {
-      this._expected = true;
+      this._satisfied = true;
       if (this.value === null) {
         throw new TestException({
           message: "value is null",
@@ -1225,7 +1168,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeNullOrUndefined",
     value: function toBeNullOrUndefined() {
-      this._expected = true;
+      this._satisfied = true;
       if (this.value == null) ; else {
         throw new TestException({
           message: "value is not null/undefined",
@@ -1238,7 +1181,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeNullOrUndefined",
     value: function notToBeNullOrUndefined() {
-      this._expected = true;
+      this._satisfied = true;
       if (this.value == null) {
         throw new TestException({
           message: "value is null/undefined",
@@ -1251,7 +1194,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeEmptyArray",
     value: function toBeEmptyArray() {
-      this._expected = true;
+      this._satisfied = true;
       if (base.isSomeArray(this.value)) {
         throw new TestException({
           message: "".concat(this.value, " is some array"),
@@ -1264,7 +1207,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeValid",
     value: function toBeValid(fnValidation) {
-      this._expected = true;
+      this._satisfied = true;
       if (!base.isFunction(fnValidation)) {
         throw new TestException({
           message: "fnValidation is not function",
@@ -1284,7 +1227,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeValid",
     value: function notToBeValid(fnValidation) {
-      this._expected = true;
+      this._satisfied = true;
       if (!base.isFunction(fnValidation)) {
         throw new TestException({
           message: "fnValidation is not function",
@@ -1306,7 +1249,7 @@ var Expect = /*#__PURE__*/function () {
     value: function toThrow(ex) {
       var shape = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var strict = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-      this._expected = true;
+      this._satisfied = true;
       if (!base.isFunction(this.value)) {
         throw new TestException({
           message: "given argument is not a function.",
@@ -1381,7 +1324,7 @@ var Expect = /*#__PURE__*/function () {
     value: function notToThrow(ex) {
       var shape = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var strict = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-      this._expected = true;
+      this._satisfied = true;
       if (!base.isFunction(this.value)) {
         throw new TestException({
           message: "given argument is not a function.",
@@ -1467,7 +1410,7 @@ var Expect = /*#__PURE__*/function () {
             case 0:
               shape = _args.length > 1 && _args[1] !== undefined ? _args[1] : false;
               strict = _args.length > 2 && _args[2] !== undefined ? _args[2] : false;
-              this._expected = true;
+              this._satisfied = true;
               if (base.isFunction(this.value)) {
                 _context.next = 5;
                 break;
@@ -1612,7 +1555,7 @@ var Expect = /*#__PURE__*/function () {
             case 0:
               shape = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : false;
               strict = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : false;
-              this._expected = true;
+              this._satisfied = true;
               if (base.isFunction(this.value)) {
                 _context2.next = 5;
                 break;
@@ -1748,7 +1691,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeTruthy",
     value: function toBeTruthy() {
-      this._expected = true;
+      this._satisfied = true;
       if (this.value) ; else {
         throw new TestException({
           message: "".concat(this.value, " is not truthy"),
@@ -1766,7 +1709,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeFalsy",
     value: function toBeFalsy() {
-      this._expected = true;
+      this._satisfied = true;
       if (!this.value) ; else {
         throw new TestException({
           message: "".concat(this.value, " is not falsy"),
@@ -1784,7 +1727,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "toBeNaN",
     value: function toBeNaN() {
-      this._expected = true;
+      this._satisfied = true;
       if (isNaN(this.value)) ; else {
         throw new TestException({
           message: "".concat(this.value, " is not NaN"),
@@ -1797,7 +1740,7 @@ var Expect = /*#__PURE__*/function () {
   }, {
     key: "notToBeNaN",
     value: function notToBeNaN() {
-      this._expected = true;
+      this._satisfied = true;
       if (!isNaN(this.value)) ; else {
         throw new TestException({
           message: "".concat(this.value, " is NaN"),
@@ -1823,12 +1766,19 @@ var Test = /*#__PURE__*/function () {
       return new Promise(function (res) {
         var start = new Date();
         if (base.isFunction(_this.fn)) {
-          var _expect = new Expect();
-          try {
-            var _result = _this.fn(function (x) {
+          var expectProvider = function expectProvider(fn) {
+            var expect = function expect(x) {
               _expect.value = x;
               return _expect;
-            });
+            };
+            var fnStr = fn.toString();
+            var wrapper = new Function("expect", "\n      return function() {\n        return (".concat(fnStr, ")();\n      };\n    "));
+            return wrapper(expect);
+          };
+          var _expect = new Expect();
+          try {
+            var wrappedFn = expectProvider(_this.fn);
+            var _result = wrappedFn();
             if (_result && base.isFunction(_result.then)) {
               _result.then(function (result) {
                 res({
@@ -1836,14 +1786,14 @@ var Test = /*#__PURE__*/function () {
                   test: _this.name,
                   result: result,
                   time: new Date() - start,
-                  expected: _expect.expected
+                  satisfied: _expect.satisfied
                 });
               })["catch"](function (ex) {
                 res({
                   success: false,
                   test: _this.name,
                   time: new Date() - start,
-                  expected: _expect.expected,
+                  satisfied: _expect.satisfied,
                   err: new TestException({
                     message: "test '".concat(_this.name, "' failed."),
                     code: 501,
@@ -1858,7 +1808,7 @@ var Test = /*#__PURE__*/function () {
                 test: _this.name,
                 time: new Date() - start,
                 result: _result,
-                expected: _expect.expected
+                satisfied: _expect.satisfied
               });
             }
           } catch (ex) {
@@ -1866,7 +1816,7 @@ var Test = /*#__PURE__*/function () {
               success: false,
               test: _this.name,
               time: new Date() - start,
-              expected: _expect.expected,
+              satisfied: _expect.satisfied,
               err: new TestException({
                 message: "test '".concat(_this.name, "' failed."),
                 code: 501,
@@ -1919,7 +1869,7 @@ var TestRunner = /*#__PURE__*/function () {
     key: "_runSingle",
     value: function () {
       var _runSingle2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(test, onProgress, i) {
-        var tr;
+        var testType, tr;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -1943,7 +1893,7 @@ var TestRunner = /*#__PURE__*/function () {
                   });
                 }
               }
-              if (test instanceof Test) {
+              if (!(test == null)) {
                 _context.next = 6;
                 break;
               }
@@ -1951,33 +1901,50 @@ var TestRunner = /*#__PURE__*/function () {
               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"
+                })
+              });
+              _context.next = 17;
+              break;
+            case 6:
+              if (test instanceof Test) {
+                _context.next = 12;
+                break;
+              }
+              this._unknown++;
+              testType = base.typename(test);
+              this._errors.push({
+                index: i,
+                err: new TestException({
+                  message: "Given test is '".concat(testType, "'. Expected a function or an instance of '@locustjs/test:Test' class."),
                   code: 1504,
                   status: "invalid-test"
                 })
               });
-              _context.next = 11;
+              _context.next = 17;
               break;
-            case 6:
-              _context.next = 8;
+            case 12:
+              _context.next = 14;
               return test.run();
-            case 8:
+            case 14:
               tr = _context.sent;
               this._results.push(tr);
               if (base.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++;
               } else {
                 this._failed++;
               }
-            case 11:
+            case 17:
             case "end":
               return _context.stop();
           }
@@ -2010,18 +1977,33 @@ var TestRunner = /*#__PURE__*/function () {
             tests = [tests];
           }
           if (base.isArray(tests)) {
-            var _tests = tests.map(function (test) {
+            var prs = tests.map(function (test, i) {
               var _test = test;
               if (base.isArray(test)) {
-                if (test.length == 2) {
-                  _test = new Test(test[0], test[1]);
+                if (test.length == 2 && base.isString(test[0])) {
+                  if (base.isFunction(test[1])) {
+                    _test = new Test(test[0], test[1]);
+                  } else if (test[1] instanceof Test) {
+                    _test = test[1];
+                    if (base.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 (base.isFunction(test[0])) {
+                    _test = new Test("nonamed test " + i, test[0]);
+                  }
                 }
               }
               return _test;
             }).map(function (test, i) {
               return _this._runSingle(test, onProgress, i);
             });
-            Promise.all(_tests).then(function (_) {
+            Promise.all(prs).then(function (_) {
               return res(_this.result);
             })["catch"](function (ex) {
               _this._errors.push({
@@ -2077,7 +2059,7 @@ var TestRunner = /*#__PURE__*/function () {
             return "\t".concat(i == err.length - 1 ? "".concat(fgYellow) : "".concat(fgGray, "error ").concat(testResult.err.code, ": ")).concat(msg).concat(reset);
           }).join("\n");
           if (base.isObject(testResult.err)) {
-            if (!testResult.expected) {
+            if (!testResult.satisfied) {
               message += "".concat(bright).concat(fgWhite).concat(testResult.test, ": ").concat(fgYellow, "faulted").concat(reset, " ").concat(t);
               message += "\n";
               message += "".concat(fgGray).concat(err, " ").concat(reset);
@@ -2086,7 +2068,7 @@ var TestRunner = /*#__PURE__*/function () {
               message += "\n";
               message += "".concat(fgGray).concat(err, " ").concat(reset);
             }
-          } else if (!testResult.expected) {
+          } else if (!testResult.satisfied) {
             message += "".concat(bright).concat(fgWhite).concat(testResult.test, ": ").concat(fgMagenta, "expect not used").concat(reset, " ").concat(t);
             if (testResult.err) {
               message += "\n";
@@ -2107,14 +2089,18 @@ var TestRunner = /*#__PURE__*/function () {
         _loop();
       }
       if (detailed && this._errors.length) {
-        console.log("Errors:");
+        console.log("\nErrors:");
         var _iterator = _createForOfIteratorHelper(this._errors),
           _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var error = _step.value;
             if (error.index !== undefined) {
-              console.log("".concat(error.index, ". ").concat(error.test, ": ").concat(error.err.innerException.toString()));
+              if (error.err.innerException) {
+                console.log("".concat(error.index, ". ").concat(error.test, ": ").concat(error.err.innerException.toString()));
+              } else {
+                console.log("".concat(error.index, ". ").concat(error.err.status, ": ").concat(error.err.message));
+              }
             } else {
               console.log("".concat(error.err.toString()));
             }
@@ -2175,7 +2161,13 @@ var TestRunner = /*#__PURE__*/function () {
                 t = i < 0 || _args2.length <= i ? undefined : _args2[i];
                 if (i != _args2.length - 1 || !base.isBool(t)) {
                   if (base.isIterable(t)) {
-                    _tests = [].concat(_toConsumableArray(_tests), _toConsumableArray(t));
+                    if (base.isArray(t) && t.length == 2 && base.isString(t[0]) && (base.isFunction(t[1]) || t[1] instanceof Test)) {
+                      _tests.push(t);
+                    } else {
+                      _tests.push.apply(_tests, _toConsumableArray(t));
+                    }
+                  } else {
+                    _tests.push(["test " + i, t]);
                   }
                 }
               }