mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-15 13:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve .toThrow() compatibility with Jest (#1728)

Browse Source
This commit is contained in:
Alex Lam S.L
2023-01-05 10:15:04 +02:00
committed by GitHub
parent 7550658fab
commit 7f96f72d65
2 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/bun-types/bun-test.d.ts vendored
View File

@@ -50,7 +50,7 @@ declare module "bun:test" {
toBeGreaterThanOrEqual(value: number | bigint): void;
toBeLessThan(value: number | bigint): void;
toBeLessThanOrEqual(value: number | bigint): void;
toThrow(message: string | ErrorConstructor): void;
toThrow(error?: string | Error | ErrorConstructor): void;
}
}

48
src/bun.js/test/jest.zig
View File

@@ -1087,11 +1087,6 @@ pub const Expect = struct {
const _arguments = callFrame.arguments(1);
const arguments: []const JSValue = _arguments.ptr[0.._arguments.len];
if (arguments.len < 1) {
globalObject.throwInvalidArguments("toThrow() requires 1 argument", .{});
return .zero;
}
if (this.scope.tests.items.len <= this.test_id) {
globalObject.throw("toThrow() must be called in a test", .{});
return .zero;
@@ -1099,8 +1094,16 @@ pub const Expect = struct {
active_test_expectation_counter.actual += 1;
const expected = arguments[0];
expected.ensureStillAlive();
const expected_value = if (arguments.len > 0) brk: {
const value = arguments[0];
if (value.isEmptyOrUndefinedOrNull() or !value.isObject() and !value.isString()) {
var fmt = JSC.ZigConsoleClient.Formatter{ .globalThis = globalObject };
globalObject.throw("Expected value must be string or Error: {any}", .{ value.toFmt(globalObject, &fmt) });
return .zero;
}
break :brk value;
} else .zero;
expected_value.ensureStillAlive();
const value = Expect.capturedValueGetCached(thisValue) orelse {
globalObject.throw("Internal consistency error: the expect(value) was garbage collected but it should not have been!", .{});
@@ -1108,7 +1111,7 @@ pub const Expect = struct {
};
value.ensureStillAlive();
if ((!value.jsType().isFunction())) {
if (!value.jsType().isFunction()) {
globalObject.throw("Expected value must be a function", .{});
return .zero;
}
@@ -1124,23 +1127,36 @@ pub const Expect = struct {
return .zero;
}
if (expected.isString()) {
const message = result.get(globalObject, "message");
if (expected_value == .zero) return thisValue;
const expected_error = expected_value.toError(globalObject);
if (expected_value.isString() or !expected_error.isUndefined()) {
const expected = brk: {
if (expected_value.isString()) break :brk expected_value;
break :brk expected_error.get(globalObject, "message");
};
const actual = result.get(globalObject, "message");
// TODO support partial match
const pass = if (message) |actual| expected.isSameValue(actual, globalObject) else false;
const pass = brk: {
if (expected) |expected_message|
if (actual) |actual_message|
break :brk expected_message.isSameValue(actual_message, globalObject);
break :brk false;
};
if (pass) return thisValue;
globalObject.throw("\n\tExpected: {s}\n\tReceived: {s}", .{
expected.getZigString(globalObject),
if (message) |actual| actual.getZigString(globalObject) else ZigString.init("undefined"),
if (expected) |message| message.getZigString(globalObject) else ZigString.init("undefined"),
if (actual) |message| message.getZigString(globalObject) else ZigString.init("undefined"),
});
return .zero;
}
if (result.isInstanceOf(globalObject, expected)) return thisValue;
if (result.isInstanceOf(globalObject, expected_value)) return thisValue;
globalObject.throw("\n\tExpected type: {s}\n\tReceived type: {s}", .{
expected.getName(globalObject),
if (result.get(globalObject, "name")) |name| name.getZigString(globalObject) else ZigString.init("<UnknownError>"),
expected_value.getName(globalObject),
if (result.get(globalObject, "name")) |name| name.getZigString(globalObject) else ZigString.init("<Unknown>"),
});
return .zero;
}