aboutsummaryrefslogtreecommitdiff
path: root/src/bun.js/test
diff options
context:
space:
mode:
authorGravatar Dylan Conway <35280289+dylan-conway@users.noreply.github.com> 2023-02-23 23:57:19 -0800
committerGravatar GitHub <noreply@github.com> 2023-02-23 23:57:19 -0800
commit3f04f8d0a653cf5decef2225c2044742b382718a (patch)
tree91eb6500834e3157ecb9ab208101aa368a1191c8 /src/bun.js/test
parentb5bdde28ed34070cbb1d34d13f414f4c513ee40d (diff)
downloadbun-3f04f8d0a653cf5decef2225c2044742b382718a.tar.gz
bun-3f04f8d0a653cf5decef2225c2044742b382718a.tar.zst
bun-3f04f8d0a653cf5decef2225c2044742b382718a.zip
Upgrade Zig (#2151)
* fixup * Upgrade Zig * Remove bad assertion * strings * bump * mode -> optimize * optimize * Linux build * Update bindgen.zig
Diffstat (limited to 'src/bun.js/test')
-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 23dd05e94..6281a3bda 100644
--- a/src/bun.js/test/jest.zig
+++ b/src/bun.js/test/jest.zig
@@ -435,28 +435,28 @@ pub const Jest = struct {
ctx: js.JSContextRef,
_: js.JSObjectRef,
_: js.JSObjectRef,
- arguments: []const js.JSValueRef,
+ arguments_: []const js.JSValueRef,
exception: js.ExceptionRef,
) js.JSValueRef {
var runner_ = runner orelse {
JSError(getAllocator(ctx), "Run bun wiptest to run a test", .{}, ctx, exception);
return js.JSValueMakeUndefined(ctx);
};
+ const arguments = @ptrCast([]const JSC.JSValue, arguments_);
- if (arguments.len < 1 or !js.JSValueIsString(ctx, arguments[0])) {
+ if (arguments.len < 1 or !arguments[0].isString()) {
JSError(getAllocator(ctx), "Bun.jest() expects a string filename", .{}, ctx, exception);
return js.JSValueMakeUndefined(ctx);
}
- var str = js.JSValueToStringCopy(ctx, arguments[0], exception);
- defer js.JSStringRelease(str);
- var ptr = js.JSStringGetCharacters8Ptr(str);
- const len = js.JSStringGetLength(str);
- if (len == 0 or ptr[0] != '/') {
+ var str = arguments[0].toSlice(ctx, bun.default_allocator);
+ defer str.deinit();
+ var slice = str.slice();
+
+ if (str.len == 0 or slice[0] != '/') {
JSError(getAllocator(ctx), "Bun.jest() expects an absolute file path", .{}, ctx, exception);
return js.JSValueMakeUndefined(ctx);
}
- var str_value = ptr[0..len];
- var filepath = Fs.FileSystem.instance.filename_store.append([]const u8, str_value) catch unreachable;
+ var filepath = Fs.FileSystem.instance.filename_store.append([]const u8, slice) catch unreachable;
var scope = runner_.getOrPutFile(filepath);
DescribeScope.active = scope;
@@ -2495,7 +2495,7 @@ pub const DescribeScope = struct {
pub fn execCallback(this: *DescribeScope, ctx: js.JSContextRef, comptime hook: LifecycleHook) JSValue {
const name = comptime @as(string, @tagName(hook));
var hooks: []JSC.JSValue = @field(this, name).items;
- for (hooks) |cb, i| {
+ for (hooks, 0..) |cb, i| {
if (cb.isEmpty()) continue;
const pending_test = Jest.runner.?.pending_test;