Merge branch 'main' into jarred/esm-conditions

1 files changed, 9 insertions, 14 deletions

diff --git a/src/bun.js/test/jest.zig b/src/bun.js/test/jest.zig
index 6c77d7aaa..00cc954ad 100644
--- a/src/bun.js/test/jest.zig
+++ b/src/bun.js/test/jest.zig
@@ -698,22 +698,22 @@ pub const Jest = struct {
             Expect.getConstructor(globalObject),
         );
 
-        const mock_object = JSMockFunction__createObject(globalObject);
+        const mock_fn = JSMockFunction__createObject(globalObject);
         const spyOn = JSC.NewFunction(globalObject, ZigString.static("spyOn"), 2, JSMock__spyOn, false);
         const restoreAllMocks = JSC.NewFunction(globalObject, ZigString.static("restoreAllMocks"), 2, jsFunctionResetSpies, false);
-        module.put(
-            globalObject,
-            ZigString.static("mock"),
-            mock_object,
-        );
+        module.put(globalObject, ZigString.static("mock"), mock_fn);
 
         const jest = JSValue.createEmptyObject(globalObject, 3);
-        jest.put(globalObject, ZigString.static("fn"), mock_object);
+        jest.put(globalObject, ZigString.static("fn"), mock_fn);
         jest.put(globalObject, ZigString.static("spyOn"), spyOn);
         jest.put(globalObject, ZigString.static("restoreAllMocks"), restoreAllMocks);
         module.put(globalObject, ZigString.static("jest"), jest);
         module.put(globalObject, ZigString.static("spyOn"), spyOn);
 
+        const vi = JSValue.createEmptyObject(globalObject, 1);
+        vi.put(globalObject, ZigString.static("fn"), mock_fn);
+        module.put(globalObject, ZigString.static("vi"), vi);
+
         return module;
     }
 
@@ -989,15 +989,10 @@ pub const Expect = struct {
     }
 
     pub fn call(globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSC.JSValue {
-        const arguments_ = callframe.arguments(1);
-        if (arguments_.len < 1) {
-            globalObject.throw("expect() requires one argument\n", .{});
-            return .zero;
-        }
-        const arguments = arguments_.ptr[0..arguments_.len];
+        const arguments = callframe.arguments(1);
+        const value = if (arguments.len < 1) JSC.JSValue.jsUndefined() else arguments.ptr[0];
 
         var expect = globalObject.bunVM().allocator.create(Expect) catch unreachable;
-        const value = arguments[0];
 
         if (Jest.runner.?.pending_test == null) {
             const err = globalObject.createErrorInstance("expect() must be called in a test", .{});