@vitest/expect 0.34.4 → 0.34.5

package/dist/index.js

@@ -1,9 +1,9 @@
 import { getColors, stringify, isObject, assertTypes } from '@vitest/utils';
 export { setupColors } from '@vitest/utils';
 import { diff } from '@vitest/utils/diff';
-import { AssertionError, util } from 'chai';
 import { isMockFunction } from '@vitest/spy';
 import { processError } from '@vitest/utils/error';
+import { util } from 'chai';
 
 const MATCHERS_OBJECT = Symbol.for("matchers-object");
 const JEST_MATCHERS_OBJECT = Symbol.for("$$jest-matchers-object");
@@ -665,6 +665,7 @@ function wrapSoft(utils, fn) {
 }
 
 const JestChaiExpect = (chai, utils) => {
+  const { AssertionError } = chai;
   const c = () => getColors();
   function def(name, fn) {
     const addMethod = (n) => {
@@ -1067,18 +1068,15 @@ Number of calls: ${c().bold(spy.mock.calls.length)}
     );
     if (called && isNot)
       msg = formatCalls(spy, msg);
-    if (called && isNot || !called && !isNot) {
-      const err = new Error(msg);
-      err.name = "AssertionError";
-      throw err;
-    }
+    if (called && isNot || !called && !isNot)
+      throw new AssertionError(msg);
   });
   def(["toHaveBeenCalledWith", "toBeCalledWith"], function(...args) {
     const spy = getSpy(this);
     const spyName = spy.getMockName();
     const pass = spy.mock.calls.some((callArg) => equals(callArg, args, [iterableEquality]));
     const isNot = utils.flag(this, "negate");
-    let msg = utils.getMessage(
+    const msg = utils.getMessage(
       this,
       [
         pass,
@@ -1087,12 +1085,8 @@ Number of calls: ${c().bold(spy.mock.calls.length)}
         args
       ]
     );
-    if (pass && isNot || !pass && !isNot) {
-      msg = formatCalls(spy, msg, args);
-      const err = new Error(msg);
-      err.name = "AssertionError";
-      throw err;
-    }
+    if (pass && isNot || !pass && !isNot)
+      throw new AssertionError(formatCalls(spy, msg, args));
   });
   def(["toHaveBeenNthCalledWith", "nthCalledWith"], function(times, ...args) {
     const spy = getSpy(this);
@@ -1138,11 +1132,20 @@ Number of calls: ${c().bold(spy.mock.calls.length)}
         return;
       }
     } else {
+      let isThrow = false;
       try {
         obj();
       } catch (err) {
+        isThrow = true;
         thrown = err;
       }
+      if (!isThrow && !isNot) {
+        const message = utils.flag(this, "message") || "expected function to throw an error, but it didn't";
+        const error = {
+          showDiff: false
+        };
+        throw new AssertionError(message, error, utils.flag(this, "ssfi"));
+      }
     }
     if (typeof expected === "function") {
       const name = expected.name || expected.prototype.constructor.name;
@@ -1208,7 +1211,7 @@ Number of calls: ${c().bold(spy.mock.calls.length)}
     const spyName = spy.getMockName();
     const pass = spy.mock.results.some(({ type, value: result }) => type === "return" && equals(value, result));
     const isNot = utils.flag(this, "negate");
-    let msg = utils.getMessage(
+    const msg = utils.getMessage(
       this,
       [
         pass,
@@ -1217,12 +1220,8 @@ Number of calls: ${c().bold(spy.mock.calls.length)}
         value
       ]
     );
-    if (pass && isNot || !pass && !isNot) {
-      msg = formatReturns(spy, msg, value);
-      const err = new Error(msg);
-      err.name = "AssertionError";
-      throw err;
-    }
+    if (pass && isNot || !pass && !isNot)
+      throw new AssertionError(formatReturns(spy, msg, value));
   });
   def(["toHaveLastReturnedWith", "lastReturnedWith"], function(value) {
     const spy = getSpy(this);
@@ -1258,8 +1257,9 @@ Number of calls: ${c().bold(spy.mock.calls.length)}
     return this.be.satisfy(matcher, message);
   });
   utils.addProperty(chai.Assertion.prototype, "resolves", function __VITEST_RESOLVES__() {
+    const error = new Error("resolves");
     utils.flag(this, "promise", "resolves");
-    utils.flag(this, "error", new Error("resolves"));
+    utils.flag(this, "error", error);
     const test = utils.flag(this, "vitest-test");
     const obj = utils.flag(this, "object");
     if (typeof (obj == null ? void 0 : obj.then) !== "function")
@@ -1276,7 +1276,12 @@ Number of calls: ${c().bold(spy.mock.calls.length)}
               return result.call(this, ...args);
             },
             (err) => {
-              throw new Error(`promise rejected "${String(err)}" instead of resolving`);
+              const _error = new AssertionError(
+                `promise rejected "${utils.inspect(err)}" instead of resolving`,
+                { showDiff: false }
+              );
+              _error.stack = error.stack.replace(error.message, _error.message);
+              throw _error;
             }
           );
           return recordAsyncExpect(test, promise);
@@ -1286,8 +1291,9 @@ Number of calls: ${c().bold(spy.mock.calls.length)}
     return proxy;
   });
   utils.addProperty(chai.Assertion.prototype, "rejects", function __VITEST_REJECTS__() {
+    const error = new Error("rejects");
     utils.flag(this, "promise", "rejects");
-    utils.flag(this, "error", new Error("rejects"));
+    utils.flag(this, "error", error);
     const test = utils.flag(this, "vitest-test");
     const obj = utils.flag(this, "object");
     const wrapper = typeof obj === "function" ? obj() : obj;
@@ -1301,7 +1307,12 @@ Number of calls: ${c().bold(spy.mock.calls.length)}
         return async (...args) => {
           const promise = wrapper.then(
             (value) => {
-              throw new Error(`promise resolved "${String(value)}" instead of rejecting`);
+              const _error = new AssertionError(
+                `promise resolved "${utils.inspect(value)}" instead of rejecting`,
+                { showDiff: false }
+              );
+              _error.stack = error.stack.replace(error.message, _error.message);
+              throw _error;
             },
             (err) => {
               utils.flag(this, "object", err);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/expect",
   "type": "module",
-  "version": "0.34.4",
+  "version": "0.34.5",
   "description": "Jest's expect matchers as a Chai plugin",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -30,12 +30,12 @@
   ],
   "dependencies": {
     "chai": "^4.3.7",
-    "@vitest/utils": "0.34.4",
-    "@vitest/spy": "0.34.4"
+    "@vitest/utils": "0.34.5",
+    "@vitest/spy": "0.34.5"
   },
   "devDependencies": {
     "picocolors": "^1.0.0",
-    "@vitest/runner": "0.34.4"
+    "@vitest/runner": "0.34.5"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",