aboutsummaryrefslogtreecommitdiff
path: root/src/bun.js/test/jest.zig
diff options
context:
space:
mode:
authorGravatar Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> 2023-01-08 07:36:42 -0800
committerGravatar Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> 2023-01-08 07:37:51 -0800
commit83a5c9f3da91b677fd6c9f1bc06b69f292997bd6 (patch)
tree19b6b2fce484999da8e2499926f6eda5b704379b /src/bun.js/test/jest.zig
parent791f8ab0a17d87d5fed6c53033d7f3d3b5dad6cc (diff)
downloadbun-83a5c9f3da91b677fd6c9f1bc06b69f292997bd6.tar.gz
bun-83a5c9f3da91b677fd6c9f1bc06b69f292997bd6.tar.zst
bun-83a5c9f3da91b677fd6c9f1bc06b69f292997bd6.zip
[internal] Fix checking for Error object
Diffstat (limited to 'src/bun.js/test/jest.zig')
-rw-r--r--src/bun.js/test/jest.zig20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/bun.js/test/jest.zig b/src/bun.js/test/jest.zig
index 590d5ec2b..68469c7e8 100644
--- a/src/bun.js/test/jest.zig
+++ b/src/bun.js/test/jest.zig
@@ -1098,7 +1098,7 @@ pub const Expect = struct {
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) });
+ globalObject.throw("Expected value must be string or Error: {any}", .{value.toFmt(globalObject, &fmt)});
return .zero;
}
break :brk value;
@@ -1117,19 +1117,19 @@ pub const Expect = struct {
}
const not = this.op.contains(.not);
- const result = value.call(globalObject, &.{}).toError(globalObject);
- if (result.isUndefined()) {
+ const result = value.call(globalObject, &.{}).toError_();
+ if (result == .zero) {
if (not) return thisValue;
globalObject.throw("Expected function to throw", .{});
return .zero;
- } else if(not) {
+ } else if (not) {
globalObject.throw("Expected function not to throw", .{});
return .zero;
}
- if (expected_value == .zero) return thisValue;
+ if (expected_value == .zero or !expected_value.isCell()) return thisValue;
- const expected_error = expected_value.toError(globalObject);
+ const expected_error = expected_value.toError() orelse expected_value;
if (expected_value.isString() or !expected_error.isUndefined()) {
const expected = brk: {
@@ -1401,7 +1401,7 @@ pub const TestScope = struct {
initial_value = js.JSObjectCallAsFunctionReturnValue(vm.global, callback, null, 0, null);
}
- if (initial_value.isAnyError(vm.global)) {
+ if (initial_value.isAnyError()) {
vm.runErrorHandler(initial_value, null);
return .{ .fail = active_test_expectation_counter.actual };
}
@@ -1640,7 +1640,7 @@ pub const DescribeScope = struct {
}
Jest.runner.?.pending_test = pending_test;
- if (result.isAnyError(ctx)) return result;
+ if (result.isAnyError()) return result;
if (comptime hook == .beforeAll or hook == .afterAll) {
hooks[i] = JSC.JSValue.zero;
@@ -1725,8 +1725,8 @@ pub const DescribeScope = struct {
return null;
},
}
- } else if (result.isAnyError(ctx)) {
- exception.* = result.asObjectRef();
+ } else if (result.toError()) |err| {
+ exception.* = err.asObjectRef();
return null;
}
}