feat(test): rejects.toThrow and resolves.toThrow (#7652)

oven-sh · Dec 14, 2023 · 1fc9b56 · 1fc9b56
1 parent 8ec405f
commit 1fc9b56
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/bun.js/test/expect.zig b/src/bun.js/test/expect.zig
@@ -1702,14 +1702,18 @@ pub const Expect = struct {
 
         const value: JSValue = this.getValue(globalObject, thisValue, "toThrow", "<green>expected<r>") orelse return .zero;
 
-        if (!value.jsType().isFunction()) {
-            globalObject.throw("Expected value must be a function", .{});
-            return .zero;
-        }
-
         const not = this.flags.not;
 
         const result_: ?JSValue = brk: {
+            if (!value.jsType().isFunction()) {
+                if (this.flags.promise != .none) {
+                    break :brk value;
+                }
+
+                globalObject.throw("Expected value must be a function", .{});
+                return .zero;
+            }
+
             var vm = globalObject.bunVM();
             var return_value: JSValue = .zero;
 

diff --git a/test/js/bun/test/expect.test.js b/test/js/bun/test/expect.test.js
@@ -52,7 +52,7 @@ describe("expect()", () => {
     await expect(Promise.reject({ a: 1, b: 2 })).rejects.toMatchObject({ a: 1 });
     await expect(Promise.reject({ a: 1, b: 2 })).rejects.not.toMatchObject({ c: 1 });
     await expect(Promise.reject(new Error("rejectMessage"))).rejects.toMatchObject({ message: "rejectMessage" });
-    //await expect(Promise.reject(new Error())).rejects.toThrow(); // FIXME
+    await expect(Promise.reject(new Error())).rejects.toThrow();
 
     // not receiving a rejected promise -> should throw
     if (isBun) {
@@ -82,6 +82,7 @@ describe("expect()", () => {
         throw new Error();
       }),
     ).resolves.toThrow();
+    await expect(Promise.resolve(new Error())).resolves.toThrow();
 
     // not receiving a resolved promise -> should throw
     if (isBun) {