mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

run beforeAll before the first file and afterAll after the last file (#23113)

Browse Source 
Fixes #23066

Reverts the breaking change to this order made in #22534
This commit is contained in:
pfg
2025-09-30 21:47:31 -07:00
committed by GitHub
parent 1fb9be3880
commit 613aea1787
8 changed files with 100 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/cli/test_command.zig
View File

@@ -1763,18 +1763,17 @@ pub const TestCommand = struct {
const reporter = this.reporter;
const vm = this.vm;
var files = this.files;
const allocator = this.allocator;
bun.assert(files.len > 0);
if (files.len > 1) {
for (files[0 .. files.len - 1]) |file_name| {
TestCommand.run(reporter, vm, file_name.slice(), allocator) catch |err| handleTopLevelTestErrorBeforeJavaScriptStart(err);
for (files[0 .. files.len - 1], 0..) |file_name, i| {
TestCommand.run(reporter, vm, file_name.slice(), .{ .first = i == 0, .last = false }) catch |err| handleTopLevelTestErrorBeforeJavaScriptStart(err);
reporter.jest.default_timeout_override = std.math.maxInt(u32);
Global.mimalloc_cleanup(false);
}
}
TestCommand.run(reporter, vm, files[files.len - 1].slice(), allocator) catch |err| handleTopLevelTestErrorBeforeJavaScriptStart(err);
TestCommand.run(reporter, vm, files[files.len - 1].slice(), .{ .first = files.len == 1, .last = true }) catch |err| handleTopLevelTestErrorBeforeJavaScriptStart(err);
}
};
@@ -1792,7 +1791,7 @@ pub const TestCommand = struct {
reporter: *CommandLineReporter,
vm: *jsc.VirtualMachine,
file_name: string,
_: std.mem.Allocator,
first_last: bun_test.BunTestRoot.FirstLast,
) !void {
defer {
js_ast.Expr.Data.Store.reset();
@@ -1832,7 +1831,7 @@ pub const TestCommand = struct {
var bun_test_root = &jest.Jest.runner.?.bun_test_root;
// Determine if this file should run tests concurrently based on glob pattern
const should_run_concurrent = reporter.jest.shouldFileRunConcurrently(file_id);
bun_test_root.enterFile(file_id, reporter, should_run_concurrent);
bun_test_root.enterFile(file_id, reporter, should_run_concurrent, first_last);
defer bun_test_root.exitFile();
reporter.jest.current_file.set(file_title, file_prefix, repeat_count, repeat_index);